Provide UI for per-extension enabling/disabling of error collection.

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"
@@ skipping 19 matching lines @@
 #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);
+// The default mask (for the time being) is to report nothing.

[not at google - send to devlin, 2014/04/15 21:57:41]

"default" mask is pretty meaningless without context. could you mention what it
means in the comment and/or name the variable better?

[Devlin, 2014/04/16 18:10:48]

Done.

+const int32 kDefaultMask = 0;
 
 const char kAppsDeveloperToolsExtensionId[] =
     "ohmmkhmmmpcnpikjeljgnaoabkaalbgc";
 
 }  // namespace
 
 void ErrorConsole::Observer::OnErrorConsoleDestroyed() {
 }
 
 ErrorConsole::ErrorConsole(Profile* profile)
@@ skipping 41 matching lines @@
 
   pref->second =
       enabled ? pref->second | (1 << type) : pref->second &~(1 << type);
 
   ExtensionPrefs::Get(profile_)->UpdateExtensionPref(
       extension_id,
       kStoreExtensionErrorsPref,
       base::Value::CreateIntegerValue(pref->second));
 }
 
+bool ErrorConsole::IsReportingEnabledForExtension(
+    const std::string& extension_id) const {
+  return ShouldReportErrorForExtension(extension_id,
+                                       ExtensionError::MANIFEST_ERROR) ||
+         ShouldReportErrorForExtension(extension_id,
+                                       ExtensionError::RUNTIME_ERROR);
+}
+
 void ErrorConsole::UseDefaultReportingForExtension(
     const std::string& extension_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!enabled_ || !Extension::IdIsValid(extension_id))
     return;
 
   pref_map_.erase(extension_id);
   ExtensionPrefs::Get(profile_)->UpdateExtensionPref(
       extension_id,
       kStoreExtensionErrorsPref,
       NULL);
 }
 
 void ErrorConsole::ReportError(scoped_ptr<ExtensionError> error) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (!enabled_ || !Extension::IdIsValid(error->extension_id()))
-    return;
-
-  ErrorPreferenceMap::const_iterator pref =
-      pref_map_.find(error->extension_id());
-  // Check the mask to see if we report the error. If we don't have a specific
-  // entry, use the default mask.
-  if ((pref == pref_map_.end() &&
-          ((default_mask_ & (1 << error->type())) == 0)) ||
-      (pref != pref_map_.end() && (pref->second & (1 << error->type())) == 0)) {
+  if (!enabled_ ||
+      !Extension::IdIsValid(error->extension_id()) ||
+      !ShouldReportErrorForExtension(error->extension_id(), error->type())) {
     return;
   }
 
   const ExtensionError* weak_error = errors_.AddError(error.Pass());
   FOR_EACH_OBSERVER(Observer, observers_, OnErrorAdded(weak_error));
 }
 
 const ErrorList& ErrorConsole::GetErrorsForExtension(
     const std::string& extension_id) const {
   return errors_.GetErrorsForExtension(extension_id);
@@ skipping 123 matching lines @@
                                              ExtensionError::MANIFEST_ERROR);
 
       AddManifestErrorsForExtension(info->extension);
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
+bool ErrorConsole::ShouldReportErrorForExtension(
+    const std::string& extension_id, ExtensionError::Type type) const {
+  ErrorPreferenceMap::const_iterator pref = pref_map_.find(extension_id);
+  // Registered preferences take priority over everything else.

[not at google - send to devlin, 2014/04/15 21:57:41]

nit: put this comment above the declaration of |pref| since it's related

[Devlin, 2014/04/16 18:10:48]

Done.

+  if (pref != pref_map_.end())
+    return (pref->second & (1 << type)) != 0;
+
+  // If the default mask says to report the error, do so.
+  if ((default_mask_ & (1 << type)) != 0)
+    return true;
+
+  // One last check: If the extension is unpacked, we report all errors by
+  // default.
+  const Extension* extension =
+      ExtensionRegistry::Get(profile_)->GetExtensionById(
+          extension_id, ExtensionRegistry::EVERYTHING);
+  if (extension && extension->location() == Manifest::UNPACKED)
+    return true;
+
+  return false;
+}
+
 }  // namespace extensions