Moved CrxInstaller and CrxInstallerError into extensions namespace

chrome/browser/extensions/crx_installer.cc

 // Copyright (c) 2012 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/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 using content::UserMetricsAction;
-using extensions::Extension;
-using extensions::PermissionsUpdater;
+
+namespace extensions {
 
 namespace {
 
 // Used in histograms; do not change order.
 enum OffStoreInstallDecision {
   OnStoreInstall,
   OffStoreInstallAllowed,
   OffStoreInstallDisallowed,
   NumOffStoreInstallDecision
 };
 
 }  // namespace
 
 // static
 scoped_refptr<CrxInstaller> CrxInstaller::Create(
     ExtensionService* frontend,
     ExtensionInstallPrompt* client) {
   return new CrxInstaller(frontend->AsWeakPtr(), client, NULL);
 }
 
 // static
 scoped_refptr<CrxInstaller> CrxInstaller::Create(
     ExtensionService* frontend,
     ExtensionInstallPrompt* client,
-    const extensions::WebstoreInstaller::Approval* approval) {
+    const WebstoreInstaller::Approval* approval) {
   return new CrxInstaller(frontend->AsWeakPtr(), client, approval);
 }
 
 CrxInstaller::CrxInstaller(
     base::WeakPtr<ExtensionService> frontend_weak,
     ExtensionInstallPrompt* client,
-    const extensions::WebstoreInstaller::Approval* approval)
+    const WebstoreInstaller::Approval* approval)
     : install_directory_(frontend_weak->install_directory()),
       install_source_(Extension::INTERNAL),
       approved_(false),
       extensions_enabled_(frontend_weak->extensions_enabled()),
       delete_source_(false),
       create_app_shortcut_(false),
       frontend_weak_(frontend_weak),
       profile_(frontend_weak->profile()),
       client_(client),
       apps_require_extension_mime_type_(false),
@@ skipping 36 matching lines @@
         base::Bind(&extension_file_util::DeleteFile, source_file_, false));
   }
   // Make sure the UI is deleted on the ui thread.
   BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, client_);
   client_ = NULL;
 }
 
 void CrxInstaller::InstallCrx(const FilePath& source_file) {
   source_file_ = source_file;
 
-  scoped_refptr<extensions::SandboxedUnpacker> unpacker(
-      new extensions::SandboxedUnpacker(
+  scoped_refptr<SandboxedUnpacker> unpacker(
+      new SandboxedUnpacker(
           source_file,
           content::ResourceDispatcherHost::Get() != NULL,
           install_source_,
           creation_flags_,
           this));
 
   if (!BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
-          base::Bind(
-              &extensions::SandboxedUnpacker::Start, unpacker.get())))
+          base::Bind(&SandboxedUnpacker::Start, unpacker.get())))
     NOTREACHED();
 }
 
 void CrxInstaller::InstallUserScript(const FilePath& source_file,
                                      const GURL& download_url) {
   DCHECK(!download_url.is_empty());
 
   source_file_ = source_file;
   download_url_ = download_url;
 
   if (!BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&CrxInstaller::ConvertUserScriptOnFileThread, this)))
     NOTREACHED();
 }
 
 void CrxInstaller::ConvertUserScriptOnFileThread() {
   string16 error;
-  scoped_refptr<Extension> extension = extensions::ConvertUserScriptToExtension(
+  scoped_refptr<Extension> extension = ConvertUserScriptToExtension(
       source_file_, download_url_, &error);
   if (!extension) {
     ReportFailureFromFileThread(CrxInstallerError(error));
     return;
   }
 
   OnUnpackSuccess(extension->path(), extension->path(), NULL, extension);
 }
 
 void CrxInstaller::InstallWebApp(const WebApplicationInfo& web_app) {
@@ skipping 55 matching lines @@
   // SandboxedUnpacker sets extension->location.
   if (extension->is_theme() || Extension::IsExternalLocation(install_source_))
     return CrxInstallerError();
 
   if (!extensions_enabled_) {
     return CrxInstallerError(
         l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALL_NOT_ENABLED));
   }
 
   if (install_cause_ == extension_misc::INSTALL_CAUSE_USER_DOWNLOAD) {
-    if (extensions::switch_utils::IsEasyOffStoreInstallEnabled()) {
+    if (switch_utils::IsEasyOffStoreInstallEnabled()) {
       const char* kHistogramName = "Extensions.OffStoreInstallDecisionEasy";
       if (is_gallery_install()) {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OnStoreInstall,
                                   NumOffStoreInstallDecision);
       } else {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OffStoreInstallAllowed,
                                   NumOffStoreInstallDecision);
       }
     } else {
       const char* kHistogramName = "Extensions.OffStoreInstallDecisionHard";
@@ skipping 46 matching lines @@
       if (extension->UpdatesFromGallery()) {
         return CrxInstallerError(
             l10n_util::GetStringFUTF16(
                 IDS_EXTENSION_DISALLOW_NON_DOWNLOADED_GALLERY_INSTALLS,
                 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE)));
       }
 
       // For self-hosted apps, verify that the entire extent is on the same
       // host (or a subdomain of the host) the download happened from.  There's
       // no way for us to verify that the app controls any other hosts.
-      URLPattern pattern(extensions::UserScript::kValidUserScriptSchemes);
+      URLPattern pattern(UserScript::kValidUserScriptSchemes);
       pattern.SetHost(download_url_.host());
       pattern.SetMatchSubdomains(true);
 
       URLPatternSet patterns = extension_->web_extent();
       for (URLPatternSet::const_iterator i = patterns.begin();
            i != patterns.end(); ++i) {
         if (!pattern.MatchesHost(i->host())) {
           return CrxInstallerError(
               l10n_util::GetStringUTF16(
                   IDS_EXTENSION_INSTALL_INCORRECT_INSTALL_HOST));
@@ skipping 71 matching lines @@
       ->IsExtensionBlacklisted(extension_->id())) {
     VLOG(1) << "This extension: " << extension_->id()
             << " is blacklisted. Install failed.";
     ReportFailureFromUIThread(
         CrxInstallerError(
             l10n_util::GetStringUTF16(IDS_EXTENSION_CANT_INSTALL_BLACKLISTED)));
     return;
   }
 
   string16 error;
-  if (!extensions::ExtensionSystem::Get(profile_)->management_policy()->
+  if (!ExtensionSystem::Get(profile_)->management_policy()->
       UserMayLoad(extension_, &error)) {
     ReportFailureFromUIThread(CrxInstallerError(error));
     return;
   }
 
   GURL overlapping_url;
   const Extension* overlapping_extension =
       frontend_weak_->extensions()->
       GetHostedAppByOverlappingWebExtent(extension_->web_extent());
   if (overlapping_extension &&
@@ skipping 197 matching lines @@
   // Some users (such as the download shelf) need to know when a
   // CRXInstaller is done.  Listening for the EXTENSION_* events
   // is problematic because they don't know anything about the
   // extension before it is unpacked, so they cannot filter based
   // on the extension.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CRX_INSTALLER_DONE,
       content::Source<CrxInstaller>(this),
       content::Details<const Extension>(extension));
 }
+
+}  // namespace extensions