Remove dependency on content::BrowserThread from GCMDriver

chrome/browser/services/gcm/gcm_driver.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SERVICES_GCM_GCM_DRIVER_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_DRIVER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #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"
 #include "google_apis/gaia/identity_provider.h"
 #include "google_apis/gcm/gcm_client.h"
 
 namespace base {
 class FilePath;
+class MessageLoopProxy;
+class SequencedTaskRunner;
 }
 
 namespace extensions {
 class ExtensionGCMAppHandlerTest;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
@@ skipping 10 matching lines @@
                               GCMClient::Result result)> RegisterCallback;
   typedef base::Callback<void(const std::string& message_id,
                               GCMClient::Result result)> SendCallback;
   typedef base::Callback<void(GCMClient::Result result)> UnregisterCallback;
   typedef base::Callback<void(const GCMClient::GCMStatistics& stats)>
       GetGCMStatisticsCallback;
 
   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.
   void Enable();
   void Disable();
 
   // This method must be called before destroying the GCMDriver. Once it has
   // been called, no other GCMDriver methods may be used.
   virtual void Shutdown();
 
@@ skipping 116 matching lines @@
   bool gcm_enabled_;
 
   // Flag to indicate if GCMClient is ready.
   bool gcm_client_ready_;
 
   // The account ID that this service is responsible for. Empty when the service
   // is not running.
   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_;
 
   // For all the work occurring on the IO thread. Must be destroyed on the IO
   // thread.
   scoped_ptr<IOWorker> io_worker_;
 
   // App handler map (from app_id to handler pointer).
   // The handler is not owned.
   GCMAppHandlerMap app_handlers_;
@@ skipping 15 matching lines @@
 
   // Used to pass a weak pointer to the IO worker.
   base::WeakPtrFactory<GCMDriver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriver);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_DRIVER_H_