Enable InstanceID field trial by default

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 <utility>
 
 #include "base/base_switches.h"

[jianli, 2016/04/08 00:20:43]

nit: remove this

[johnme, 2016/04/08 13:19:43]

Done.

 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #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"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
@@ skipping 17 matching lines @@
 }
 
 }  // namespace
 
 class InstanceIDApiTest : public ExtensionApiTest {
  public:
   InstanceIDApiTest();
 
  protected:
   void SetUpOnMainThread() override;
-  void SetUpCommandLine(base::CommandLine* command_line) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstanceIDApiTest);
 };
 
 InstanceIDApiTest::InstanceIDApiTest() {
 }
 
 void InstanceIDApiTest::SetUpOnMainThread() {
   gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactory(
       browser()->profile(), &BuildFakeGCMProfileService);
 
   ExtensionApiTest::SetUpOnMainThread();
 }
 
-void InstanceIDApiTest::SetUpCommandLine(base::CommandLine* command_line) {
-  ExtensionApiTest::SetUpCommandLine(command_line);
-
-  // Makes sure InstanceID is enabled for testing.
-  command_line->AppendSwitchASCII(
-       switches::kForceFieldTrials, "InstanceID/Enabled/");
-}
-
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, GetID) {
   ASSERT_TRUE(RunExtensionTest("instance_id/get_id"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, GetCreationTime) {
   ASSERT_TRUE(RunExtensionTest("instance_id/get_creation_time"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, DeleteID) {
   ASSERT_TRUE(RunExtensionTest("instance_id/delete_id"));
@@ skipping 14 matching lines @@
   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();
 }
 
 }  // namespace extensions