Remove gcm channel state supported by sync service.

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/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/api/gcm/gcm_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "extensions/test/result_catcher.h"
 
 using extensions::ResultCatcher;
 
 namespace {
 
 const char kEventsExtension[] = "gcm/events";
 
 gcm::GCMClient::SendErrorDetails CreateErrorDetails(
@@ skipping 53 matching lines @@
   // 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() {
-  // Enable GCM such that tests could be run on all channels.
-  browser()->profile()->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, true);
-
   gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactory(
       browser()->profile(), &gcm::FakeGCMProfileService::Build);
   fake_gcm_profile_service_ = static_cast<gcm::FakeGCMProfileService*>(
       gcm::GCMProfileServiceFactory::GetInstance()->GetForProfile(
           browser()->profile()));
 
   ExtensionApiTest::SetUpOnMainThread();
 }
 
 void GcmApiTest::StartCollecting() {
@@ skipping 164 matching lines @@
   incognito_catcher.RestrictToBrowserContext(
       profile()->GetOffTheRecordProfile());
 
   ASSERT_TRUE(RunExtensionTestIncognito("gcm/functions/incognito"));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(incognito_catcher.GetNextResult()) << incognito_catcher.message();
 }
 
 }  // namespace extensions