Remove an unused param for remoting's URLRequestContextGetter

Bug: 837753 Change-Id: Iaf98bcb0b98b096880a0e888da690e411505b3c4 Reviewed-on: https://chromium-review.googlesource.com/1037245 Commit-Queue: Helen Li <xunjieli@chromium.org> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org> Cr-Commit-Position: refs/heads/master@{#555141}
Denger-Network · May 1, 2018 · 38b3cd0 · 38b3cd0
1 parent 4315854
commit 38b3cd0
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 41 deletions.
diff --git a/remoting/base/url_request_context_getter.cc b/remoting/base/url_request_context_getter.cc
@@ -15,10 +15,8 @@
 namespace remoting {
 
 URLRequestContextGetter::URLRequestContextGetter(
-    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
     : network_task_runner_(network_task_runner),
-      file_task_runner_(file_task_runner),
       proxy_config_service_(
           net::ProxyResolutionService::CreateSystemProxyConfigService(
               network_task_runner)) {}

diff --git a/remoting/base/url_request_context_getter.h b/remoting/base/url_request_context_getter.h
@@ -23,10 +23,8 @@ namespace remoting {
 
 class URLRequestContextGetter : public net::URLRequestContextGetter {
  public:
-  // TODO(mmenke): Remove |file_task_runner|, as it's no longer used.
-  URLRequestContextGetter(
-      scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
+  explicit URLRequestContextGetter(
+      scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
 
   // Overridden from net::URLRequestContextGetter:
   net::URLRequestContext* GetURLRequestContext() override;
@@ -38,7 +36,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
-  scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
   std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
   std::unique_ptr<net::NetLog> net_log_;
   std::unique_ptr<net::URLRequestContext> url_request_context_;

diff --git a/remoting/client/chromoting_client_runtime.cc b/remoting/client/chromoting_client_runtime.cc
@@ -58,10 +58,7 @@ ChromotingClientRuntime::ChromotingClientRuntime() {
   display_task_runner_ = AutoThread::Create("native_disp", ui_task_runner_);
   network_task_runner_ = AutoThread::CreateWithType(
       "native_net", ui_task_runner_, base::MessageLoop::TYPE_IO);
-  file_task_runner_ = AutoThread::CreateWithType("native_file", ui_task_runner_,
-                                                 base::MessageLoop::TYPE_IO);
-  url_requester_ =
-      new URLRequestContextGetter(network_task_runner_, file_task_runner_);
+  url_requester_ = new URLRequestContextGetter(network_task_runner_);
 }
 
 ChromotingClientRuntime::~ChromotingClientRuntime() {

diff --git a/remoting/client/chromoting_client_runtime.h b/remoting/client/chromoting_client_runtime.h
@@ -68,10 +68,6 @@ class ChromotingClientRuntime {
     return display_task_runner_;
   }
 
-  scoped_refptr<AutoThreadTaskRunner> file_task_runner() {
-    return file_task_runner_;
-  }
-
   scoped_refptr<net::URLRequestContextGetter> url_requester() {
     return url_requester_;
   }
@@ -98,7 +94,6 @@ class ChromotingClientRuntime {
   scoped_refptr<AutoThreadTaskRunner> audio_task_runner_;
   scoped_refptr<AutoThreadTaskRunner> display_task_runner_;
   scoped_refptr<AutoThreadTaskRunner> network_task_runner_;
-  scoped_refptr<AutoThreadTaskRunner> file_task_runner_;
 
   scoped_refptr<net::URLRequestContextGetter> url_requester_;
 

diff --git a/remoting/client/chromoting_client_runtime_unittest.cc b/remoting/client/chromoting_client_runtime_unittest.cc
@@ -21,7 +21,6 @@ TEST(ChromotingClientRuntimeTest, StartAndStop) {
   EXPECT_TRUE(runtime->network_task_runner().get());
   EXPECT_TRUE(runtime->ui_task_runner().get());
   EXPECT_TRUE(runtime->display_task_runner().get());
-  EXPECT_TRUE(runtime->file_task_runner().get());
   EXPECT_TRUE(runtime->url_requester().get());
   EXPECT_TRUE(runtime->log_writer());
 }

diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
@@ -138,8 +138,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostContext::Create(
       AutoThread::Create("ChromotingCaptureThread", ui_task_runner),
 #endif
       AutoThread::Create("ChromotingEncodeThread", ui_task_runner),
-      base::MakeRefCounted<URLRequestContextGetter>(network_task_runner,
-                                                    file_task_runner),
+      base::MakeRefCounted<URLRequestContextGetter>(network_task_runner),
       nullptr));
 }
 

diff --git a/remoting/host/setup/me2me_native_messaging_host_main.cc b/remoting/host/setup/me2me_native_messaging_host_main.cc
@@ -92,10 +92,6 @@ int Me2MeNativeMessagingHostMain(int argc, char** argv) {
   io_thread.StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 
-  base::Thread file_thread("file_thread");
-  file_thread.StartWithOptions(
-      base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
-
   base::MessageLoopForUI message_loop;
   base::RunLoop run_loop;
 
@@ -184,8 +180,7 @@ int Me2MeNativeMessagingHostMain(int argc, char** argv) {
 
   // OAuth client (for credential requests). IO thread is used for blocking
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter(
-      new URLRequestContextGetter(io_thread.task_runner(),
-                                  file_thread.task_runner()));
+      new URLRequestContextGetter(io_thread.task_runner()));
   std::unique_ptr<OAuthClient> oauth_client(
       new GaiaOAuthClient(url_request_context_getter));
 

diff --git a/remoting/host/setup/start_host_main.cc b/remoting/host/setup/start_host_main.cc
@@ -218,12 +218,9 @@ int StartHostMain(int argc, char** argv) {
   base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0);
   base::Thread io_thread("IO thread");
   io_thread.StartWithOptions(io_thread_options);
-  base::Thread file_thread("file thread");
-  file_thread.StartWithOptions(io_thread_options);
 
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter(
-      new remoting::URLRequestContextGetter(io_thread.task_runner(),
-                                            file_thread.task_runner()));
+      new remoting::URLRequestContextGetter(io_thread.task_runner()));
 
   net::URLFetcher::SetIgnoreCertificateRequests(true);
 

diff --git a/remoting/test/access_token_fetcher.cc b/remoting/test/access_token_fetcher.cc
@@ -80,8 +80,7 @@ void AccessTokenFetcher::GetAccessTokenFromRefreshToken(
 void AccessTokenFetcher::CreateNewGaiaOAuthClientInstance() {
   scoped_refptr<remoting::URLRequestContextGetter> request_context_getter;
   request_context_getter = new remoting::URLRequestContextGetter(
-      base::ThreadTaskRunnerHandle::Get(),   // network_runner
-      base::ThreadTaskRunnerHandle::Get());  // file_runner
+      base::ThreadTaskRunnerHandle::Get());
 
   auth_client_.reset(new gaia::GaiaOAuthClient(request_context_getter.get()));
 }

diff --git a/remoting/test/app_remoting_report_issue_request.cc b/remoting/test/app_remoting_report_issue_request.cc
@@ -48,8 +48,7 @@ bool AppRemotingReportIssueRequest::Start(
   request_complete_callback_ = done_callback;
 
   request_context_getter_ = new remoting::URLRequestContextGetter(
-      base::ThreadTaskRunnerHandle::Get(),   // network_runner
-      base::ThreadTaskRunnerHandle::Get());  // file_runner
+      base::ThreadTaskRunnerHandle::Get());
 
   std::string upload_data = abandon_host ? "{ 'abandonHost': 'true' }" : "{}";
 

diff --git a/remoting/test/host_list_fetcher.cc b/remoting/test/host_list_fetcher.cc
@@ -34,8 +34,7 @@ void HostListFetcher::RetrieveHostlist(const std::string& access_token,
   hostlist_callback_ = callback;
 
   request_context_getter_ = new remoting::URLRequestContextGetter(
-      /*network_runner=*/base::ThreadTaskRunnerHandle::Get(),
-      /*file_runner=*/base::ThreadTaskRunnerHandle::Get());
+      /*network_runner=*/base::ThreadTaskRunnerHandle::Get());
 
   request_ = net::URLFetcher::Create(GURL(target_url), net::URLFetcher::GET,
                                      this, TRAFFIC_ANNOTATION_FOR_TESTS);

diff --git a/remoting/test/remote_host_info_fetcher.cc b/remoting/test/remote_host_info_fetcher.cc
@@ -52,8 +52,7 @@ bool RemoteHostInfoFetcher::RetrieveRemoteHostInfo(
   remote_host_info_callback_ = callback;
 
   request_context_getter_ = new remoting::URLRequestContextGetter(
-      base::ThreadTaskRunnerHandle::Get(),   // network_runner
-      base::ThreadTaskRunnerHandle::Get());  // file_runner
+      base::ThreadTaskRunnerHandle::Get());
 
   request_ = net::URLFetcher::Create(GURL(service_url), net::URLFetcher::POST,
                                      this, TRAFFIC_ANNOTATION_FOR_TESTS);

diff --git a/remoting/test/test_chromoting_client.cc b/remoting/test/test_chromoting_client.cc
@@ -82,9 +82,8 @@ void TestChromotingClient::StartConnection(
   jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
   scoped_refptr<URLRequestContextGetter> request_context_getter;
-  request_context_getter = new URLRequestContextGetter(
-      base::ThreadTaskRunnerHandle::Get(),   // network_runner
-      base::ThreadTaskRunnerHandle::Get());  // file_runner
+  request_context_getter =
+      new URLRequestContextGetter(base::ThreadTaskRunnerHandle::Get());
 
   client_context_.reset(new ClientContext(base::ThreadTaskRunnerHandle::Get()));