Enable Error Console for ADT and <= Dev Channel

chrome/browser/extensions/error_console/error_console.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 <list>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/feature_switch.h"
 
 namespace extensions {
 
 namespace {
 // The key into the Extension prefs for an Extension's specific reporting
 // settings.
 const char kStoreExtensionErrorsPref[] = "store_extension_errors";
 
 // The default mask (for the time being) is to report everything.
 const int32 kDefaultMask = (1 << ExtensionError::MANIFEST_ERROR) |
                            (1 << ExtensionError::RUNTIME_ERROR);
 }
 
 void ErrorConsole::Observer::OnErrorConsoleDestroyed() {
 }
 
 ErrorConsole::ErrorConsole(Profile* profile,
                            ExtensionService* extension_service)
      : enabled_(false), default_mask_(kDefaultMask), profile_(profile) {
 // TODO(rdevlin.cronin): Remove once crbug.com/159265 is fixed.
 #if !defined(ENABLE_EXTENSIONS)
   return;
 #endif
 
-  // If we don't have the necessary FeatureSwitch enabled, then return
-  // immediately. Since we never register for any notifications, this ensures
-  // the ErrorConsole will never be enabled.
-  if (!FeatureSwitch::error_console()->IsEnabled())
-    return;
-
   pref_registrar_.Init(profile_->GetPrefs());
   pref_registrar_.Add(prefs::kExtensionsUIDeveloperMode,
                       base::Bind(&ErrorConsole::OnPrefChanged,
                                  base::Unretained(this)));
 
   if (profile_->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode))
     Enable(extension_service);
 }
 
 ErrorConsole::~ErrorConsole() {
@@ skipping 166 matching lines @@
 
       AddManifestErrorsForExtension(info->extension);
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace extensions