Allow webstore extensions to use experimental permissions.

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 1239 matching lines @@
 
     if (reload_reason != NOT_NEEDED) {
       // Reloading and extension reads files from disk.  We do this on the
       // UI thread because reloads should be very rare, and the complexity
       // added by delaying the time when the extensions service knows about
       // all extensions is significant.  See crbug.com/37548 for details.
       // |allow_io| disables tests that file operations run on the file
       // thread.
       base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-      int flags = Extension::NO_FLAGS;
-      if (Extension::ShouldDoStrictErrorChecking(info->extension_location))
-        flags |= Extension::STRICT_ERROR_CHECKS;
-      if (extension_prefs_->AllowFileAccess(info->extension_id))
-        flags |= Extension::ALLOW_FILE_ACCESS;
-      if (extension_prefs_->IsFromWebStore(info->extension_id))
-        flags |= Extension::FROM_WEBSTORE;
-      if (extension_prefs_->IsFromBookmark(info->extension_id))
-        flags |= Extension::FROM_BOOKMARK;
       std::string error;
       scoped_refptr<const Extension> extension(
           extension_file_util::LoadExtension(
               info->extension_path,
               info->extension_location,
-              flags,
+              GetExtensionCreateFlagsForInstalledExtension(info),
               &error));
 
       if (extension.get()) {
         extensions_info->at(i)->extension_manifest.reset(
             static_cast<DictionaryValue*>(
                 extension->manifest_value()->DeepCopy()));
         should_write_prefs = true;
       }
     }
   }
@@ skipping 136 matching lines @@
   }
 }
 
 void ExtensionService::LoadInstalledExtension(const ExtensionInfo& info,
                                               bool write_to_prefs) {
   std::string error;
   scoped_refptr<const Extension> extension(NULL);
   if (!extension_prefs_->IsExtensionAllowedByPolicy(info.extension_id)) {
     error = errors::kDisabledByPolicy;
   } else if (info.extension_manifest.get()) {
-    int flags = Extension::NO_FLAGS;
-    if (info.extension_location != Extension::LOAD)
-      flags |= Extension::REQUIRE_KEY;
-    if (Extension::ShouldDoStrictErrorChecking(info.extension_location))
-      flags |= Extension::STRICT_ERROR_CHECKS;
-    if (extension_prefs_->AllowFileAccess(info.extension_id))
-      flags |= Extension::ALLOW_FILE_ACCESS;
-    if (extension_prefs_->IsFromWebStore(info.extension_id))
-      flags |= Extension::FROM_WEBSTORE;
-    if (extension_prefs_->IsFromBookmark(info.extension_id))
-      flags |= Extension::FROM_BOOKMARK;
     extension = Extension::Create(
         info.extension_path,
         info.extension_location,
         *info.extension_manifest,
-        flags,
+        GetExtensionCreateFlagsForInstalledExtension(&info),
         &error);
   } else {
     error = errors::kManifestUnreadable;
   }
 
   // Once installed, non-unpacked extensions cannot change their IDs (e.g., by
   // updating the 'key' field in their manifest).
   if (extension &&
       extension->location() != Extension::LOAD &&
       info.extension_id != extension->id()) {
     error = errors::kCannotChangeExtensionID;
     extension = NULL;
     UserMetrics::RecordAction(UserMetricsAction("Extensions.IDChangedError"));
   }
 
   if (!extension) {
     ReportExtensionLoadError(info.extension_path, error, false);
     return;
   }
 
   if (write_to_prefs)
     extension_prefs_->UpdateManifest(extension);
 
   AddExtension(extension);
 }
 
+int ExtensionService::GetExtensionCreateFlagsForInstalledExtension(

[Mihai Parparita -not on Chrome, 2011/10/16 22:41:46]

Seems like this could be a static/in an unnamed namespace function in this file.

+    const ExtensionInfo* info) {
+    int flags = Extension::NO_FLAGS;
+    if (info->extension_location != Extension::LOAD)

[Mihai Parparita -not on Chrome, 2011/10/16 22:41:46]

Body is indented one too many times.

+      flags |= Extension::REQUIRE_KEY;
+    if (Extension::ShouldDoStrictErrorChecking(info->extension_location))
+      flags |= Extension::STRICT_ERROR_CHECKS;
+    if (extension_prefs_->AllowFileAccess(info->extension_id))
+      flags |= Extension::ALLOW_FILE_ACCESS;
+    if (extension_prefs_->IsFromWebStore(info->extension_id))
+      flags |= Extension::FROM_WEBSTORE;
+    if (extension_prefs_->IsFromBookmark(info->extension_id))
+      flags |= Extension::FROM_BOOKMARK;
+    return flags;
+}
+
 void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
   // The ChromeURLRequestContexts need to be first to know that the extension
   // was loaded, otherwise a race can arise where a renderer that is created
   // for the extension may try to load an extension URL with an extension id
   // that the request context doesn't yet know about. The profile is responsible
   // for ensuring its URLRequestContexts appropriately discover the loaded
   // extension.
   profile_->RegisterExtensionWithRequestContexts(extension);
 
   // Tell subsystems that use the EXTENSION_LOADED notification about the new
@@ skipping 1525 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }