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

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

 // Copyright 2013 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.
 
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/api/gcm/gcm_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 
 namespace {
 
 const char kEventsExtension[] = "gcm/events";
 
 }  // namespace
 
 namespace extensions {
 
 class GcmApiTest : public ExtensionApiTest {
  public:
   GcmApiTest() : fake_gcm_profile_service_(NULL) {}
 
  protected:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
 
   void StartCollecting();
 
   const Extension* LoadTestExtension(const std::string& extension_path,
                                      const std::string& page_name);
   gcm::FakeGCMProfileService* service() const;
   bool ShouldSkipTest() const;
 
  private:
   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() {
   service()->set_collect(true);
 }
 
 gcm::FakeGCMProfileService* GcmApiTest::service() const {
   return fake_gcm_profile_service_;
 }
 
@@ skipping 139 matching lines @@
   ResultCatcher incognito_catcher;
   incognito_catcher.RestrictToProfile(profile()->GetOffTheRecordProfile());
 
   ASSERT_TRUE(RunExtensionTestIncognito("gcm/functions/incognito"));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(incognito_catcher.GetNextResult()) << incognito_catcher.message();
 }
 
 }  // namespace extensions