Componentizing chrome/browser/services/gcm/gcm_desktop_utils.cc.

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index c236055825b9c05e858ffdd675c2ec81215f23e0..11239ceae770b85b7f083408e59fd90ecf61557f 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -109,8 +109,8 @@
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/chrome_device_client.h"
-#include "chrome/browser/services/gcm/gcm_desktop_utils.h"
 #include "components/gcm_driver/gcm_client_factory.h"
+#include "components/gcm_driver/gcm_desktop_utils.h"
 #endif
 
 #if defined(ENABLE_BACKGROUND)
@@ -1164,11 +1164,24 @@ void BrowserProcessImpl::CreateGCMDriver() {
 #else
   base::FilePath store_path;
   CHECK(PathService::Get(chrome::DIR_GLOBAL_GCM_STORE, &store_path));
+  scoped_refptr<base::SequencedWorkerPool> worker_pool(

[Lei Zhang, 2015/09/03 04:53:26]

This can just be a base::SequencedWorkerPool* - the original code in
CreateGCMDriverDesktop() was being too cautious. I don't think the object is
going to go away in the next 4 lines.

[Jitu( very slow this week), 2015/09/03 05:31:36]

Done.

[Lei Zhang, 2015/09/03 05:56:34]

Slightly more natural to write:

Foo* foo = Bar()

instead of:

Foo* foo(Bar);

+      content::BrowserThread::GetBlockingPool());
+  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
+      worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
+          worker_pool->GetSequenceToken(),
+          base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
+
   gcm_driver_ = gcm::CreateGCMDriverDesktop(
       make_scoped_ptr(new gcm::GCMClientFactory),
       local_state(),
       store_path,
-      system_request_context());
+      system_request_context(),
+      chrome::GetChannel(),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::IO),
+      blocking_task_runner);
 #endif  // defined(OS_ANDROID)
 }