diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index 52536472514..e1e66b37f9d 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -29,6 +29,7 @@ use net_traits::request::{Type, Origin, Window}; use net_traits::response::{HttpsState, TerminationReason}; use net_traits::response::{Response, ResponseBody, ResponseType}; use resource_thread::CancellationListener; +use std::borrow::Cow; use std::collections::HashSet; use std::fs::File; use std::io::Read; @@ -51,7 +52,7 @@ enum Data { pub struct FetchContext { pub state: HttpState, - pub user_agent: String, + pub user_agent: Cow<'static, str>, pub devtools_chan: Option>, } @@ -763,7 +764,8 @@ fn http_network_or_cache_fetch(request: Rc, // Step 8 if !http_request.headers.borrow().has::() { - http_request.headers.borrow_mut().set(UserAgent(context.user_agent.clone())); + let user_agent = context.user_agent.clone().into_owned(); + http_request.headers.borrow_mut().set(UserAgent(user_agent)); } match http_request.cache_mode.get() { diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 7a1dc7c78d9..bbaee6e170d 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -39,7 +39,7 @@ use openssl::ssl::error::{OpensslError, SslError}; use profile_traits::time::{ProfilerCategory, ProfilerChan, TimerMetadata, profile}; use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType}; use resource_thread::{AuthCache, AuthCacheEntry, CancellationListener, send_error, start_sending_sniffed_opt}; -use std::borrow::ToOwned; +use std::borrow::{Cow, ToOwned}; use std::boxed::FnBox; use std::collections::HashSet; use std::error::Error; @@ -57,7 +57,7 @@ use util::prefs::PREFS; use util::thread::spawn_named; use uuid; -pub fn factory(user_agent: String, +pub fn factory(user_agent: Cow<'static, str>, http_state: HttpState, devtools_chan: Option>, profiler_chan: ProfilerChan, @@ -137,7 +137,7 @@ fn load_for_consumer(load_data: LoadData, devtools_chan: Option>, swmanager_chan: Option>, cancel_listener: CancellationListener, - user_agent: String) { + user_agent: Cow<'static, str>) { let factory = NetworkHttpRequestFactory { connector: connector, }; @@ -865,7 +865,7 @@ pub fn load(load_data: &LoadData, http_state: &HttpState, devtools_chan: Option>, request_factory: &HttpRequestFactory, - user_agent: String, + user_agent: Cow<'static, str>, cancel_listener: &CancellationListener, swmanager_chan: Option>) -> Result where A: HttpRequest + 'static, B: UIProvider { diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index 8c84fa38b48..86e382e4bb3 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -35,7 +35,7 @@ use net_traits::storage_thread::StorageThreadMsg; use profile_traits::time::ProfilerChan; use rustc_serialize::{Decodable, Encodable}; use rustc_serialize::json; -use std::borrow::ToOwned; +use std::borrow::{Cow, ToOwned}; use std::boxed::FnBox; use std::cell::Cell; use std::collections::HashMap; @@ -164,7 +164,7 @@ fn start_sending_opt(start_chan: LoadConsumer, metadata: Metadata, } /// Returns a tuple of (public, private) senders to the new threads. -pub fn new_resource_threads(user_agent: String, +pub fn new_resource_threads(user_agent: Cow<'static, str>, devtools_chan: Option>, profiler_chan: ProfilerChan, config_dir: Option) @@ -181,7 +181,7 @@ pub fn new_resource_threads(user_agent: String, /// Create a CoreResourceThread -pub fn new_core_resource_thread(user_agent: String, +pub fn new_core_resource_thread(user_agent: Cow<'static, str>, devtools_chan: Option>, profiler_chan: ProfilerChan, config_dir: Option) @@ -470,7 +470,7 @@ pub struct AuthCache { } pub struct CoreResourceManager { - user_agent: String, + user_agent: Cow<'static, str>, mime_classifier: Arc, devtools_chan: Option>, swmanager_chan: Option>, @@ -481,7 +481,7 @@ pub struct CoreResourceManager { } impl CoreResourceManager { - pub fn new(user_agent: String, + pub fn new(user_agent: Cow<'static, str>, devtools_channel: Option>, profiler_chan: ProfilerChan) -> CoreResourceManager { CoreResourceManager { diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 980c2c47572..bd43ff2064d 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -252,7 +252,7 @@ fn create_constellation(opts: opts::Opts, let bluetooth_thread: IpcSender = BluetoothThreadFactory::new(); let (public_resource_threads, private_resource_threads) = - new_resource_threads(opts.user_agent.clone(), + new_resource_threads(opts.user_agent, devtools_chan.clone(), time_profiler_chan.clone(), opts.config_dir.map(Into::into)); diff --git a/components/util/opts.rs b/components/util/opts.rs index 6a746b73bdf..148a1dfc6a7 100644 --- a/components/util/opts.rs +++ b/components/util/opts.rs @@ -11,6 +11,7 @@ use getopts::Options; use num_cpus; use prefs::{self, PrefValue, PREFS}; use resource_files::set_resources_path; +use std::borrow::Cow; use std::cmp; use std::default::Default; use std::env; @@ -139,7 +140,7 @@ pub struct Opts { pub initial_window_size: TypedSize2D, /// An optional string allowing the user agent to be set for testing. - pub user_agent: String, + pub user_agent: Cow<'static, str>, /// Whether we're running in multiprocess mode. pub multiprocess: bool, @@ -460,7 +461,7 @@ pub enum RenderApi { const DEFAULT_RENDER_API: RenderApi = RenderApi::GL; -fn default_user_agent_string(agent: UserAgent) -> String { +fn default_user_agent_string(agent: UserAgent) -> &'static str { #[cfg(all(target_os = "linux", target_arch = "x86_64"))] const DESKTOP_UA_STRING: &'static str = "Mozilla/5.0 (X11; Linux x86_64; rv:37.0) Servo/1.0 Firefox/37.0"; @@ -488,7 +489,7 @@ fn default_user_agent_string(agent: UserAgent) -> String { UserAgent::Android => { "Mozilla/5.0 (Android; Mobile; rv:37.0) Servo/1.0 Firefox/37.0" } - }.to_owned() + } } #[cfg(target_os = "android")] @@ -529,7 +530,7 @@ pub fn default_opts() -> Opts { devtools_port: None, webdriver_port: None, initial_window_size: TypedSize2D::new(1024, 740), - user_agent: default_user_agent_string(DEFAULT_USER_AGENT), + user_agent: default_user_agent_string(DEFAULT_USER_AGENT).into(), multiprocess: false, random_pipeline_closure_probability: None, random_pipeline_closure_seed: None, @@ -778,10 +779,10 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult { } let user_agent = match opt_match.opt_str("u") { - Some(ref ua) if ua == "android" => default_user_agent_string(UserAgent::Android), - Some(ref ua) if ua == "desktop" => default_user_agent_string(UserAgent::Desktop), - Some(ua) => ua, - None => default_user_agent_string(DEFAULT_USER_AGENT), + Some(ref ua) if ua == "android" => default_user_agent_string(UserAgent::Android).into(), + Some(ref ua) if ua == "desktop" => default_user_agent_string(UserAgent::Desktop).into(), + Some(ua) => ua.into(), + None => default_user_agent_string(DEFAULT_USER_AGENT).into(), }; let user_stylesheets = opt_match.opt_strs("user-stylesheet").iter().map(|filename| { diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index aee43ac0e2b..0c1f827c7a5 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -415,7 +415,7 @@ fn test_check_default_headers_loaded_in_every_request() { &AssertMustHaveHeadersRequestFactory { expected_headers: headers.clone(), body: <[_]>::to_vec(&[]) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); // Testing for method.POST load_data.method = Method::Post; @@ -426,7 +426,7 @@ fn test_check_default_headers_loaded_in_every_request() { &AssertMustHaveHeadersRequestFactory { expected_headers: headers, body: <[_]>::to_vec(&[]) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -448,7 +448,7 @@ fn test_load_when_request_is_not_get_or_head_and_there_is_no_body_content_length None, &AssertMustIncludeHeadersRequestFactory { expected_headers: content_length, body: <[_]>::to_vec(&[]) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -477,7 +477,7 @@ fn test_request_and_response_data_with_network_messages() { request_headers.set(Host { hostname: "bar.foo".to_owned(), port: None }); load_data.headers = request_headers.clone(); let _ = load(&load_data, &ui_provider, &http_state, Some(devtools_chan), &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); // notification received from devtools let devhttprequest = expect_devtools_http_request(&devtools_port); @@ -579,7 +579,7 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() { let (devtools_chan, devtools_port) = mpsc::channel::(); let load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTestNoPipeline); let _ = load(&load_data, &ui_provider, &http_state, Some(devtools_chan), &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); // notification received from devtools assert!(devtools_port.try_recv().is_err()); @@ -613,7 +613,7 @@ fn test_redirected_request_to_devtools() { let (devtools_chan, devtools_port) = mpsc::channel::(); let _ = load(&load_data, &ui_provider, &http_state, Some(devtools_chan), &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); let devhttprequest = expect_devtools_http_request(&devtools_port); let devhttpresponse = expect_devtools_http_response(&devtools_port); @@ -660,7 +660,7 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() { let ui_provider = TestProvider::new(); let _ = load(&load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -690,7 +690,7 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co let mut response = load( &load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) .unwrap(); @@ -726,7 +726,7 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte &load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) .unwrap(); @@ -772,7 +772,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() { &load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -803,7 +803,7 @@ fn test_load_doesnt_add_host_to_sts_list_when_url_is_http_even_if_sts_headers_ar &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); @@ -836,7 +836,7 @@ fn test_load_adds_host_to_sts_list_when_url_is_https_and_sts_headers_are_present &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); @@ -871,7 +871,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_ &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); @@ -906,7 +906,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re &AssertMustIncludeHeadersRequestFactory { expected_headers: cookie, body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.to_owned(), + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -949,7 +949,7 @@ fn test_load_sends_secure_cookie_if_http_changed_to_https_due_to_entry_in_hsts_s &AssertMustIncludeHeadersRequestFactory { expected_headers: headers, body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -981,7 +981,7 @@ fn test_load_sends_cookie_if_nonhttp() { &AssertMustIncludeHeadersRequestFactory { expected_headers: headers, body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -1009,7 +1009,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl( &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); let mut cookie_jar = http_state.cookie_jar.write().unwrap(); @@ -1039,7 +1039,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() { &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); assert_cookie_for_domain(http_state.cookie_jar.clone(), "http://mozilla.com", ""); @@ -1074,7 +1074,7 @@ fn test_when_cookie_set_marked_httpsonly_secure_isnt_sent_on_http_request() { &AssertMustNotIncludeHeadersRequestFactory { headers_not_expected: vec!["Cookie".to_owned()], body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -1096,7 +1096,7 @@ fn test_load_sets_content_length_to_length_of_request_body() { None, &AssertMustIncludeHeadersRequestFactory { expected_headers: content_len_headers, body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.to_owned(), + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -1122,7 +1122,7 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() { &AssertMustIncludeHeadersRequestFactory { expected_headers: accept_headers, body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.to_owned(), + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -1150,7 +1150,7 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() { &AssertMustIncludeHeadersRequestFactory { expected_headers: accept_headers, body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.to_owned(), + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -1173,7 +1173,7 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() { &AssertMustIncludeHeadersRequestFactory { expected_headers: accept_encoding_headers, body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.to_owned(), + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -1197,7 +1197,7 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() { &AssertMustIncludeHeadersRequestFactory { expected_headers: accept_encoding_headers, body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.to_owned(), + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -1226,7 +1226,7 @@ fn test_load_errors_when_there_a_redirect_loop() { let ui_provider = TestProvider::new(); match load(&load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None) { + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(ref load_err) if load_err.error == LoadErrorType::RedirectLoop => (), _ => panic!("expected max redirects to fail") } @@ -1259,7 +1259,7 @@ fn test_load_errors_when_there_is_too_many_redirects() { prefs::PrefValue::Number(redirect_limit)); match load(&load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None) { + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(LoadError { error: LoadErrorType::MaxRedirects(num_redirects), url, .. }) => { assert_eq!(num_redirects, redirect_limit as u32); @@ -1301,7 +1301,7 @@ fn test_load_follows_a_redirect() { let ui_provider = TestProvider::new(); match load(&load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None) { + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(e) => panic!("expected to follow a redirect {:?}", e), Ok(mut lr) => { let response = read_response(&mut lr); @@ -1332,7 +1332,7 @@ fn test_load_errors_when_scheme_is_not_http_or_https() { &ui_provider, &http_state, None, &DontConnectFactory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(ref load_err) if load_err.error == LoadErrorType::UnsupportedScheme { scheme: "ftp".into() } => (), _ => panic!("expected ftp scheme to be unsupported") @@ -1351,7 +1351,7 @@ fn test_load_errors_when_viewing_source_and_inner_url_scheme_is_not_http_or_http &ui_provider, &http_state, None, &DontConnectFactory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(ref load_err) if load_err.error == LoadErrorType::UnsupportedScheme { scheme: "ftp".into() } => (), _ => panic!("expected ftp scheme to be unsupported") @@ -1393,7 +1393,7 @@ fn test_load_errors_when_cancelled() { &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &cancel_listener, None) { Err(ref load_err) if load_err.error == LoadErrorType::Cancelled => (), _ => panic!("expected load cancelled error!") @@ -1463,7 +1463,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() { &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(e) => panic!("expected to follow a redirect {:?}", e), Ok(mut lr) => { @@ -1509,7 +1509,7 @@ fn test_redirect_from_x_to_x_provides_x_with_cookie_from_first_response() { &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(e) => panic!("expected to follow a redirect {:?}", e), Ok(mut lr) => { @@ -1552,7 +1552,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() { None, &AssertMustIncludeHeadersRequestFactory { expected_headers: auth_header, body: <[_]>::to_vec(&[]) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -1579,7 +1579,7 @@ fn test_auth_ui_sets_header_on_401() { None, &AssertAuthHeaderRequestFactory { expected_headers: auth_header, body: <[_]>::to_vec(&[]) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None) { + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { Err(e) => panic!("response contained error {:?}", e), Ok(response) => { assert_eq!(response.metadata.status, @@ -1612,7 +1612,7 @@ fn test_auth_ui_needs_www_auth() { let load_data = LoadData::new(LoadContext::Browsing, url, &HttpTest); let response = load(&load_data, &AuthProvider, &http_state, - None, &Factory, DEFAULT_USER_AGENT.to_owned(), + None, &Factory, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); match response { Err(e) => panic!("response contained error {:?}", e), @@ -1642,7 +1642,7 @@ fn assert_referrer_header_matches(origin_info: &LoadOrigin, &AssertMustIncludeHeadersRequestFactory { expected_headers: referrer_headers, body: <[_]>::to_vec(&[]) - }, DEFAULT_USER_AGENT.to_owned(), + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } @@ -1661,7 +1661,7 @@ fn assert_referrer_header_not_included(origin_info: &LoadOrigin, request_url: &s &AssertMustNotIncludeHeadersRequestFactory { headers_not_expected: vec!["Referer".to_owned()], body: <[_]>::to_vec(&[]) - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); } #[test] @@ -1923,7 +1923,7 @@ fn load_request_for_custom_response(expected_body: Vec) -> (Metadata, String let join_handle = thread::spawn(move || { let response = load(&load_data.clone(), &ui_provider, &http_state, - None, &Factory, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), Some(sender)); + None, &Factory, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), Some(sender)); match response { Ok(mut response) => { let metadata = response.metadata.clone(); @@ -1989,7 +1989,7 @@ fn test_content_blocked() { None, &AssertMustNotIncludeHeadersRequestFactory { headers_not_expected: vec!["Cookie".to_owned()], body: b"hi".to_vec(), - }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); match response { Ok(_) => {}, _ => panic!("request should have succeeded without cookies"), @@ -2000,7 +2000,7 @@ fn test_content_blocked() { let response = load( &load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None); + DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); match response { Err(LoadError { error: LoadErrorType::ContentBlocked, .. }) => {}, _ => panic!("request should have been blocked"), diff --git a/tests/unit/net/resource_thread.rs b/tests/unit/net/resource_thread.rs index 8d5c1a0f90f..860fa35f2e0 100644 --- a/tests/unit/net/resource_thread.rs +++ b/tests/unit/net/resource_thread.rs @@ -38,7 +38,7 @@ fn test_exit() { let (tx, _rx) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap(); let (resource_thread, _) = new_core_resource_thread( - "".to_owned(), None, ProfilerChan(tx), None); + "".into(), None, ProfilerChan(tx), None); resource_thread.send(CoreResourceMsg::Exit(sender)).unwrap(); receiver.recv().unwrap(); } @@ -48,7 +48,7 @@ fn test_bad_scheme() { let (tx, _rx) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap(); let (resource_thread, _) = new_core_resource_thread( - "".to_owned(), None, ProfilerChan(tx), None); + "".into(), None, ProfilerChan(tx), None); let (start_chan, start) = ipc::channel().unwrap(); let url = Url::parse("bogus://whatever").unwrap(); resource_thread.send(CoreResourceMsg::Load(LoadData::new(LoadContext::Browsing, url, &ResourceTest), @@ -228,7 +228,7 @@ fn test_cancelled_listener() { let (tx, _rx) = ipc::channel().unwrap(); let (exit_sender, exit_receiver) = ipc::channel().unwrap(); let (resource_thread, _) = new_core_resource_thread( - "".to_owned(), None, ProfilerChan(tx), None); + "".into(), None, ProfilerChan(tx), None); let (sender, receiver) = ipc::channel().unwrap(); let (id_sender, id_receiver) = ipc::channel().unwrap(); let (sync_sender, sync_receiver) = ipc::channel().unwrap();