Remove dependency on content::BrowserThread from GCMDriver

chrome/browser/services/gcm/fake_gcm_client.cc

Index: chrome/browser/services/gcm/fake_gcm_client.cc
diff --git a/chrome/browser/services/gcm/fake_gcm_client.cc b/chrome/browser/services/gcm/fake_gcm_client.cc
index b1f9ca3b7b5a8fa59418da758df046d7d318a8da..49f70480c9ab4f0a6f9f18e3ed2657ed0dce33f2 100644
--- a/chrome/browser/services/gcm/fake_gcm_client.cc
+++ b/chrome/browser/services/gcm/fake_gcm_client.cc
@@ -7,17 +7,22 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/sys_byteorder.h"
 #include "base/time/time.h"
-#include "content/public/browser/browser_thread.h"
 #include "google_apis/gcm/base/encryptor.h"
 
 namespace gcm {
 
-FakeGCMClient::FakeGCMClient(StartMode start_mode)
+FakeGCMClient::FakeGCMClient(
+    StartMode start_mode,
+    const scoped_refptr<base::MessageLoopProxy>& ui_thread,
+    const scoped_refptr<base::MessageLoopProxy>& io_thread)
     : delegate_(NULL),
       status_(UNINITIALIZED),
       start_mode_(start_mode),
+      ui_thread_(ui_thread),
+      io_thread_(io_thread),
       weak_ptr_factory_(this) {
 }
 
@@ -37,7 +42,7 @@ void FakeGCMClient::Initialize(
 }
 
 void FakeGCMClient::Start() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK(io_thread_->BelongsToCurrentThread());
   DCHECK_NE(STARTED, status_);
 
   if (start_mode_ == DELAY_START)
@@ -54,18 +59,18 @@ void FakeGCMClient::DoLoading() {
 }
 
 void FakeGCMClient::Stop() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK(io_thread_->BelongsToCurrentThread());
   status_ = STOPPED;
 }
 
 void FakeGCMClient::CheckOut() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK(io_thread_->BelongsToCurrentThread());
   status_ = CHECKED_OUT;
 }
 
 void FakeGCMClient::Register(const std::string& app_id,
                              const std::vector<std::string>& sender_ids) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK(io_thread_->BelongsToCurrentThread());
 
   std::string registration_id = GetRegistrationIdFromSenderIds(sender_ids);
   base::MessageLoop::current()->PostTask(
@@ -77,7 +82,7 @@ void FakeGCMClient::Register(const std::string& app_id,
 }
 
 void FakeGCMClient::Unregister(const std::string& app_id) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK(io_thread_->BelongsToCurrentThread());
 
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
@@ -89,7 +94,7 @@ void FakeGCMClient::Unregister(const std::string& app_id) {
 void FakeGCMClient::Send(const std::string& app_id,
                          const std::string& receiver_id,
                          const OutgoingMessage& message) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK(io_thread_->BelongsToCurrentThread());
 
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
@@ -110,20 +115,18 @@ GCMClient::GCMStatistics FakeGCMClient::GetStatistics() const {
 }
 
 void FakeGCMClient::PerformDelayedLoading() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK(ui_thread_->BelongsToCurrentThread());
 
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
+  io_thread_->PostTask(
       FROM_HERE,
       base::Bind(&FakeGCMClient::DoLoading, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void FakeGCMClient::ReceiveMessage(const std::string& app_id,
                                    const IncomingMessage& message) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK(ui_thread_->BelongsToCurrentThread());
 
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
+  io_thread_->PostTask(
       FROM_HERE,
       base::Bind(&FakeGCMClient::MessageReceived,
                  weak_ptr_factory_.GetWeakPtr(),
@@ -132,10 +135,9 @@ void FakeGCMClient::ReceiveMessage(const std::string& app_id,
 }
 
 void FakeGCMClient::DeleteMessages(const std::string& app_id) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK(ui_thread_->BelongsToCurrentThread());
 
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
+  io_thread_->PostTask(
       FROM_HERE,
       base::Bind(&FakeGCMClient::MessagesDeleted,
                  weak_ptr_factory_.GetWeakPtr(),