Enable Error Console for ADT and <= Dev Channel

chrome/browser/extensions/error_console/error_console_browsertest.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 "chrome/browser/extensions/error_console/error_console.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "extensions/browser/extension_error.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_urls.h"
-#include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using base::string16;
 using base::UTF8ToUTF16;
 
 namespace extensions {
 
@@ skipping 158 matching lines @@
     ACTION_NAVIGATE,
     // Simulate a browser action click.
     ACTION_BROWSER_ACTION,
     // Navigate to the new tab page.
     ACTION_NEW_TAB,
     // Do nothing (errors will be caused by a background script,
     // or by a manifest/loading warning).
     ACTION_NONE
   };
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
-
-    // We need to enable the ErrorConsole FeatureSwitch in order to collect
-    // errors.
-    FeatureSwitch::error_console()->SetOverrideValue(
-        FeatureSwitch::OVERRIDE_ENABLED);
-  }
-
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionBrowserTest::SetUpOnMainThread();
 
     // Errors are only kept if we have Developer Mode enabled.
     profile()->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true);
 
     error_console_ = ErrorConsole::Get(profile());
     CHECK(error_console_);
 
     test_data_dir_ = test_data_dir_.AppendASCII("error_console");
@@ skipping 324 matching lines @@
   const Extension* extension = NULL;
   LoadExtensionAndCheckErrors(
       "bad_extension_page",
       kNoFlags,
       1,  // One error: the page will load JS which has a reference error.
       ACTION_NEW_TAB,
       &extension);
 }
 
 }  // namespace extensions