Merge 253787 "[GCM] Make sure GCM checkout logic is invoked when..."

chrome/browser/extensions/api/gcm/gcm_apitest.cc

Index: chrome/browser/extensions/api/gcm/gcm_apitest.cc
===================================================================
--- chrome/browser/extensions/api/gcm/gcm_apitest.cc	(revision 255183)
+++ chrome/browser/extensions/api/gcm/gcm_apitest.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_client_factory.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/test/base/ui_test_utils.h"
 
@@ -25,6 +26,7 @@
   GcmApiTest() : fake_gcm_profile_service_(NULL) {}
 
  protected:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
 
   void StartCollecting();
@@ -38,13 +40,24 @@
   gcm::FakeGCMProfileService* fake_gcm_profile_service_;
 };
 
+void GcmApiTest::SetUpCommandLine(CommandLine* command_line) {
+  // We now always create the GCMProfileService instance in
+  // ProfileSyncServiceFactory that is called when a profile is being
+  // initialized. In order to prevent it from being created, we add the switch
+  // to disable the sync logic.
+  command_line->AppendSwitch(switches::kDisableSync);
+
+  ExtensionApiTest::SetUpCommandLine(command_line);
+}
+
 void GcmApiTest::SetUpOnMainThread() {
   gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactory(
       browser()->profile(), &gcm::FakeGCMProfileService::Build);
   fake_gcm_profile_service_ = static_cast<gcm::FakeGCMProfileService*>(
       gcm::GCMProfileServiceFactory::GetInstance()->GetForProfile(
           browser()->profile()));
-  gcm::FakeGCMProfileService::EnableGCMForTesting();
+
+  ExtensionApiTest::SetUpOnMainThread();
 }
 
 void GcmApiTest::StartCollecting() {