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 {
 
 // Used in histograms; do not change order.
 enum OffStoreInstallDecision {
   OnStoreInstall,
   OffStoreInstallAllowed,
   OffStoreInstallDisallowed,
   NumOffStoreInstallDecision
 };
 
 }  // namespace
 
+namespace extensions {

[not at google - send to devlin, 2012/07/04 01:13:31]

I think that usually the namespace would surround the anonymous namespaces too,
since you'd usually want for those to benefit from having access to e.g.
Extension rather than extensions::Extension (not that it matters in this case,
but a good pattern anyway).

+
 // 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,
@@ skipping 54 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;
 
@@ skipping 74 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 356 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