Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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 71 matching lines @@
     ExtensionInstallPrompt* client,
     const WebstoreInstaller::Approval* approval) {
   return new CrxInstaller(frontend->AsWeakPtr(), client, approval);
 }
 
 CrxInstaller::CrxInstaller(
     base::WeakPtr<ExtensionService> frontend_weak,
     ExtensionInstallPrompt* client,
     const WebstoreInstaller::Approval* approval)
     : install_directory_(frontend_weak->install_directory()),
-      install_source_(Extension::INTERNAL),
+      install_source_(Manifest::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),
       allow_silent_install_(false),
       install_cause_(extension_misc::INSTALL_CAUSE_UNSET),
@@ skipping 133 matching lines @@
       (!expected_manifest_.get() ||
        !expected_manifest_->Equals(original_manifest_.get()))) {
     return CrxInstallerError(
         l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID));
   }
 
   // The checks below are skipped for themes and external installs.
   // TODO(pamg): After ManagementPolicy refactoring is complete, remove this
   // and other uses of install_source_ that are no longer needed now that the
   // SandboxedUnpacker sets extension->location.
-  if (extension->is_theme() || Extension::IsExternalLocation(install_source_))
+  if (extension->is_theme() || Manifest::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 (FeatureSwitch::easy_off_store_install()->IsEnabled()) {
       const char* kHistogramName = "Extensions.OffStoreInstallDecisionEasy";
@@ skipping 78 matching lines @@
     }
   }
 
   return CrxInstallerError();
 }
 
 void CrxInstaller::OnUnpackFailure(const string16& error_message) {
   DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackFailureInstallSource",
-                            install_source(), Extension::NUM_LOCATIONS);
+                            install_source(), Manifest::NUM_LOCATIONS);
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackFailureInstallCause",
                             install_cause(),
                             extension_misc::NUM_INSTALL_CAUSES);
 
   ReportFailureFromFileThread(CrxInstallerError(error_message));
 }
 
 void CrxInstaller::OnUnpackSuccess(const FilePath& temp_dir,
                                    const FilePath& extension_dir,
                                    const DictionaryValue* original_manifest,
                                    const Extension* extension) {
   DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackSuccessInstallSource",
-                            install_source(), Extension::NUM_LOCATIONS);
+                            install_source(), Manifest::NUM_LOCATIONS);
 
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackSuccessInstallCause",
                             install_cause(),
                             extension_misc::NUM_INSTALL_CAUSES);
 
   // Note: We take ownership of |extension| and |temp_dir|.
   extension_ = extension;
   temp_dir_ = temp_dir;
 
@@ skipping 296 matching lines @@
     temp_dir_ = FilePath();
   }
 
   if (delete_source_ && !source_file_.value().empty()) {
     extension_file_util::DeleteFile(source_file_, false);
     source_file_ = FilePath();
   }
 }
 
 }  // namespace extensions