Remove the extra guard in InstanceIDProfileService

chrome/browser/extensions/api/instance_id/instance_id_apitest.cc

 // Copyright 2015 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/instance_id/instance_id_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"
@@ skipping 14 matching lines @@
   gcm::FakeGCMProfileService* service =
       new gcm::FakeGCMProfileService(Profile::FromBrowserContext(context));
   service->SetDriverForTesting(new instance_id::FakeGCMDriverForInstanceID());
   return service;
 }
 
 }  // namespace
 
 class InstanceIDApiTest : public ExtensionApiTest {
  public:
-  InstanceIDApiTest() {}
+  InstanceIDApiTest();
 
  protected:
   void SetUpOnMainThread() override;
 
  private:
+  extensions::ScopedCurrentChannel current_channel_;
+
   DISALLOW_COPY_AND_ASSIGN(InstanceIDApiTest);
 };
 
+InstanceIDApiTest::InstanceIDApiTest()
+    : current_channel_(chrome::VersionInfo::CHANNEL_DEV) {
+}
+
 void InstanceIDApiTest::SetUpOnMainThread() {
   gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactory(
       browser()->profile(), &BuildFakeGCMProfileService);
 
   ExtensionApiTest::SetUpOnMainThread();
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, GetID) {
-  extensions::ScopedCurrentChannel current_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
   ASSERT_TRUE(RunExtensionTest("instance_id/get_id"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, GetCreationTime) {
-  extensions::ScopedCurrentChannel current_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
   ASSERT_TRUE(RunExtensionTest("instance_id/get_creation_time"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, DeleteID) {
-  extensions::ScopedCurrentChannel current_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
   ASSERT_TRUE(RunExtensionTest("instance_id/delete_id"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, GetToken) {
-  extensions::ScopedCurrentChannel current_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
   ASSERT_TRUE(RunExtensionTest("instance_id/get_token"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, DeleteToken) {
-  extensions::ScopedCurrentChannel current_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
   ASSERT_TRUE(RunExtensionTest("instance_id/delete_token"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, Incognito) {
-  extensions::ScopedCurrentChannel current_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
-
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(profile());
   ResultCatcher incognito_catcher;
   incognito_catcher.RestrictToBrowserContext(
       profile()->GetOffTheRecordProfile());
 
   ASSERT_TRUE(RunExtensionTestIncognito("instance_id/incognito"));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(incognito_catcher.GetNextResult()) << incognito_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, BetaChannel) {
-  extensions::ScopedCurrentChannel current_channel(
+  extensions::ScopedCurrentChannel current_channel_override(
       chrome::VersionInfo::CHANNEL_BETA);
   ASSERT_TRUE(RunExtensionTest("instance_id/channel"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, StableChannel) {
-  extensions::ScopedCurrentChannel current_channel(
+  extensions::ScopedCurrentChannel current_channel_override(
       chrome::VersionInfo::CHANNEL_STABLE);
   ASSERT_TRUE(RunExtensionTest("instance_id/channel"));
 }
 
 }  // namespace extensions