Move the rest of extension_manifest_constants to top-level extensions/

chrome/utility/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/utility/extensions/unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.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 "content/public/child/image_decoder_utils.h"
 #include "content/public/common/common_param_traits.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/manifest.h"
+#include "extensions/common/manifest_constants.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 "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/size.h"
 
-namespace errors = extension_manifest_errors;
-namespace keys = extensions::manifest_keys;
+namespace extensions {
 
 namespace {
 
+namespace errors = manifest_errors;
+namespace keys = manifest_keys;
+
 // A limit to stop us passing dangerously large canvases to the browser.
 const int kMaxImageCanvas = 4096 * 4096;
 
 SkBitmap DecodeImage(const base::FilePath& path) {
   // Read the file from disk.
   std::string file_contents;
   if (!base::PathExists(path) ||
       !base::ReadFileToString(path, &file_contents)) {
     return SkBitmap();
   }
@@ skipping 26 matching lines @@
       }
       ++i;
     }
   }
 
   return false;
 }
 
 }  // namespace
 
-namespace extensions {
-
 struct Unpacker::InternalData {
   DecodedImages decoded_images;
 };
 
 Unpacker::Unpacker(const base::FilePath& extension_path,
                    const std::string& extension_id,
                    Manifest::Location location,
                    int creation_flags)
     : extension_path_(extension_path),
       extension_id_(extension_id),
@@ skipping 215 matching lines @@
 
 void Unpacker::SetError(const std::string &error) {
   SetUTF16Error(UTF8ToUTF16(error));
 }
 
 void Unpacker::SetUTF16Error(const string16 &error) {
   error_message_ = error;
 }
 
 }  // namespace extensions