Remove dependency on content::BrowserThread from GCMDriver

chrome/browser/services/gcm/gcm_driver.h

Index: chrome/browser/services/gcm/gcm_driver.h
diff --git a/chrome/browser/services/gcm/gcm_driver.h b/chrome/browser/services/gcm/gcm_driver.h
index 9db2d66f165fd44e177645b97c6a40b9426308ea..99f11a3bdfe1ee725f494701dc5a21537301152b 100644
--- a/chrome/browser/services/gcm/gcm_driver.h
+++ b/chrome/browser/services/gcm/gcm_driver.h
@@ -12,6 +12,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/gcm_driver/default_gcm_app_handler.h"
@@ -20,6 +21,8 @@
 
 namespace base {
 class FilePath;
+class MessageLoopProxy;
+class SequencedTaskRunner;
 }
 
 namespace extensions {
@@ -50,7 +53,10 @@ class GCMDriver : public IdentityProvider::Observer {
   GCMDriver(scoped_ptr<GCMClientFactory> gcm_client_factory,
             scoped_ptr<IdentityProvider> identity_provider,
             const base::FilePath& store_path,
-            const scoped_refptr<net::URLRequestContextGetter>& request_context);
+            const scoped_refptr<net::URLRequestContextGetter>& request_context,
+            const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
+            const scoped_refptr<base::MessageLoopProxy>& ui_thread,

[Nicolas Zea, 2014/05/21 22:16:28]

a MessageLoopProxy is a SequencedTaskRunner. You may as well pass everything as
a SequencedTaskRunner

[jianli, 2014/05/21 23:09:34]

Done.

+            const scoped_refptr<base::MessageLoopProxy>& io_thread);
   virtual ~GCMDriver();
 
   // Enables/disables GCM service.
@@ -187,6 +193,8 @@ class GCMDriver : public IdentityProvider::Observer {
   std::string account_id_;
 
   scoped_ptr<IdentityProvider> identity_provider_;
+  scoped_refptr<base::MessageLoopProxy> ui_thread_;
+  scoped_refptr<base::MessageLoopProxy> io_thread_;
 
   scoped_ptr<DelayedTaskController> delayed_task_controller_;