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/chrome_version_info.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_registry.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);
-}
+
+const char kAppsDeveloperToolsExtensionId[] =
+    "ohmmkhmmmpcnpikjeljgnaoabkaalbgc";
+
+}  // namespace
 
 void ErrorConsole::Observer::OnErrorConsoleDestroyed() {
 }
 
 ErrorConsole::ErrorConsole(Profile* profile,
                            ExtensionService* extension_service)

[not at google - send to devlin, 2014/03/31 18:52:43]

this constructor argument isn't used

[Devlin, 2014/03/31 21:18:24]

Done.

      : 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);
+  ExtensionRegistry::Get(profile_)->AddObserver(this);

[not at google - send to devlin, 2014/03/31 18:52:43]

use ScopedObserver so that you don't need to remove:

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ext...

[Devlin, 2014/03/31 21:18:24]

Done.

+
+  CheckEnabled();
 }
 
 ErrorConsole::~ErrorConsole() {
   FOR_EACH_OBSERVER(Observer, observers_, OnErrorConsoleDestroyed());
+  ExtensionRegistry::Get(profile_)->RemoveObserver(this);
 }
 
 // static
 ErrorConsole* ErrorConsole::Get(Profile* profile) {
   return ExtensionSystem::Get(profile)->error_console();
 }
 
 void ErrorConsole::SetReportingForExtension(const std::string& extension_id,
                                             ExtensionError::Type type,
                                             bool enabled) {
@@ skipping 57 matching lines @@
 void ErrorConsole::AddObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.AddObserver(observer);
 }
 
 void ErrorConsole::RemoveObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.RemoveObserver(observer);
 }
 
-void ErrorConsole::OnPrefChanged() {
-  bool developer_mode =
-      profile_->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
+bool ErrorConsole::IsEnabledForChromeExtensionsPage() const {
+  return profile_->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode) &&
+         (FeatureSwitch::error_console()->IsEnabled() ||
+          chrome::VersionInfo::GetChannel() <=

[not at google - send to devlin, 2014/03/31 18:52:43]

maybe use FeatureChannel::GetCurrentChannel() here instead, since this is
extensions code, and it's easier to test with.

[Devlin, 2014/03/31 21:18:24]

Done.

+              chrome::VersionInfo::CHANNEL_DEV);
+}
 
-  if (developer_mode && !enabled_)
+bool ErrorConsole::IsEnabledForAppsDeveloperTools() const {
+  return ExtensionRegistry::Get(profile_)->enabled_extensions()
+      .Contains(kAppsDeveloperToolsExtensionId);
+}
+
+void ErrorConsole::CheckEnabled() {
+  bool should_be_enabled = IsEnabledForChromeExtensionsPage() ||
+                           IsEnabledForAppsDeveloperTools();
+  if (should_be_enabled && !enabled_)
     Enable(ExtensionSystem::Get(profile_)->extension_service());

[not at google - send to devlin, 2014/03/31 18:52:43]

just let Enable() fetch the ExtensionService from |profile_|.

[Devlin, 2014/03/31 21:18:24]

Done.

-  else if (!developer_mode && enabled_)
+  if (!should_be_enabled && enabled_)
     Disable();
 }
 
 void ErrorConsole::Enable(ExtensionService* extension_service) {
   enabled_ = true;
 
   notification_registrar_.Add(
       this,
       chrome::NOTIFICATION_PROFILE_DESTROYED,
       content::NotificationService::AllBrowserContextsAndSources());
   notification_registrar_.Add(
       this,
       chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile_));
   notification_registrar_.Add(
       this,
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile_));
 
   if (extension_service) {
     const ExtensionSet* extensions = extension_service->extensions();

[not at google - send to devlin, 2014/03/31 18:52:43]

actually all you need is an ExtensionRegistry, not an ExtensionService

[Devlin, 2014/03/31 21:18:24]

Done.

     ExtensionPrefs* prefs = ExtensionPrefs::Get(profile_);
     for (ExtensionSet::const_iterator iter = extensions->begin();
          iter != extensions->end(); ++iter) {
       int mask = 0;
       if (prefs->ReadPrefAsInteger(iter->get()->id(),
                                    kStoreExtensionErrorsPref,
                                    &mask)) {
         pref_map_[iter->get()->id()] = mask;
       }
       AddManifestErrorsForExtension(iter->get());
     }
   }
 }
 
 void ErrorConsole::Disable() {
   notification_registrar_.RemoveAll();
   errors_.RemoveAllErrors();
   enabled_ = false;
 }
 
+void ErrorConsole::OnPrefChanged() {
+  CheckEnabled();
+}
+
+void ErrorConsole::OnExtensionUnloaded(const Extension* extension) {
+  CheckEnabled();
+}
+
+void ErrorConsole::OnExtensionLoaded(const Extension* extension) {
+  CheckEnabled();
+}
+
 void ErrorConsole::AddManifestErrorsForExtension(const Extension* extension) {
   const std::vector<InstallWarning>& warnings =
       extension->install_warnings();
   for (std::vector<InstallWarning>::const_iterator iter = warnings.begin();
        iter != warnings.end(); ++iter) {
     ReportError(scoped_ptr<ExtensionError>(new ManifestError(
         extension->id(),
         base::UTF8ToUTF16(iter->message),
         base::UTF8ToUTF16(iter->key),
         base::UTF8ToUTF16(iter->specific))));
@@ skipping 30 matching lines @@
 
       AddManifestErrorsForExtension(info->extension);
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace extensions