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

chrome/common/extensions/unpacker.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/common/extensions/unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_handle.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/zip.h"
 #include "content/public/common/common_param_traits.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/file_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/image_decoder.h"
 
@@ skipping 44 matching lines @@
 
   return false;
 }
 
 }  // namespace
 
 namespace extensions {
 
 Unpacker::Unpacker(const FilePath& extension_path,
                    const std::string& extension_id,
-                   Extension::Location location,
+                   Manifest::Location location,
                    int creation_flags)
     : extension_path_(extension_path),
       extension_id_(extension_id),
       location_(location),
       creation_flags_(creation_flags) {
 }
 
 Unpacker::~Unpacker() {
 }
 
@@ skipping 80 matching lines @@
       location_,
       *parsed_manifest_,
       creation_flags_,
       extension_id_,
       &error));
   if (!extension.get()) {
     SetError(error);
     return false;
   }
 
-  Extension::InstallWarningVector warnings;
+  std::vector<InstallWarning> warnings;
   if (!extension_file_util::ValidateExtension(extension.get(),
                                               &error, &warnings)) {
     SetError(error);
     return false;
   }
   extension->AddInstallWarnings(warnings);
 
   // Decode any images that the browser needs to display.
   std::set<FilePath> image_paths = extension->GetBrowserImages();
   for (std::set<FilePath>::iterator it = image_paths.begin();
@@ skipping 132 matching lines @@
 
 void Unpacker::SetError(const std::string &error) {
   SetUTF16Error(UTF8ToUTF16(error));
 }
 
 void Unpacker::SetUTF16Error(const string16 &error) {
   error_message_ = error;
 }
 
 }  // namespace extensions