Move ExtensionUnpacker into extensions:: namespace, rename it to Unpacker

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/extension_unpacker.h"
+#include "chrome/common/extensions/unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_handle.h"
 #include "base/scoped_temp_dir.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_manifest_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/zip.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/file_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/image_decoder.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 namespace filenames = extension_filenames;
 
-using extensions::Extension;
-
 namespace {
 
 // Errors
 const char* kCouldNotCreateDirectoryError =
     "Could not create directory for unzipping: ";
 const char* kCouldNotDecodeImageError = "Could not decode theme image.";
 const char* kCouldNotUnzipExtension = "Could not unzip extension.";
 const char* kPathNamesMustBeAbsoluteOrLocalError =
     "Path names must not be absolute or contain '..'.";
 
@@ skipping 34 matching lines @@
       }
       ++i;
     }
   }
 
   return false;
 }
 
 }  // namespace
 
-ExtensionUnpacker::ExtensionUnpacker(const FilePath& extension_path,
-                                     const std::string& extension_id,
-                                     Extension::Location location,
-                                     int creation_flags)
+namespace extensions {
+
+Unpacker::Unpacker(const FilePath& extension_path,
+                   const std::string& extension_id,
+                   Extension::Location location,
+                   int creation_flags)
     : extension_path_(extension_path),
       extension_id_(extension_id),
       location_(location),
       creation_flags_(creation_flags) {
 }
 
-ExtensionUnpacker::~ExtensionUnpacker() {
+Unpacker::~Unpacker() {
 }
 
-DictionaryValue* ExtensionUnpacker::ReadManifest() {
+DictionaryValue* Unpacker::ReadManifest() {
   FilePath manifest_path =
       temp_install_dir_.Append(Extension::kManifestFilename);
   if (!file_util::PathExists(manifest_path)) {
     SetError(errors::kInvalidManifest);
     return NULL;
   }
 
   JSONFileValueSerializer serializer(manifest_path);
   std::string error;
   scoped_ptr<Value> root(serializer.Deserialize(NULL, &error));
   if (!root.get()) {
     SetError(error);
     return NULL;
   }
 
   if (!root->IsType(Value::TYPE_DICTIONARY)) {
     SetError(errors::kInvalidManifest);
     return NULL;
   }
 
   return static_cast<DictionaryValue*>(root.release());
 }
 
-bool ExtensionUnpacker::ReadAllMessageCatalogs(
-    const std::string& default_locale) {
+bool Unpacker::ReadAllMessageCatalogs(const std::string& default_locale) {
   FilePath locales_path =
     temp_install_dir_.Append(Extension::kLocaleFolder);
 
   // Not all folders under _locales have to be valid locales.
   file_util::FileEnumerator locales(locales_path,
                                     false,
                                     file_util::FileEnumerator::DIRECTORIES);
 
   std::set<std::string> all_locales;
   extension_l10n_util::GetAllLocales(&all_locales);
   FilePath locale_path;
   while (!(locale_path = locales.Next()).empty()) {
     if (extension_l10n_util::ShouldSkipValidation(locales_path, locale_path,
                                                   all_locales))
       continue;
 
     FilePath messages_path =
       locale_path.Append(Extension::kMessagesFilename);
 
     if (!ReadMessageCatalog(messages_path))
       return false;
   }
 
   return true;
 }
 
-bool ExtensionUnpacker::Run() {
+bool Unpacker::Run() {
   DVLOG(1) << "Installing extension " << extension_path_.value();
 
   // <profile>/Extensions/INSTALL_TEMP/<version>
   temp_install_dir_ =
     extension_path_.DirName().AppendASCII(filenames::kTempExtensionName);
 
   if (!file_util::CreateDirectory(temp_install_dir_)) {
 #if defined(OS_WIN)
     std::string dir_string = WideToUTF8(temp_install_dir_.value());
 #else
@@ skipping 46 matching lines @@
   // Parse all message catalogs (if any).
   parsed_catalogs_.reset(new DictionaryValue);
   if (!extension->default_locale().empty()) {
     if (!ReadAllMessageCatalogs(extension->default_locale()))
       return false;  // Error was already reported.
   }
 
   return true;
 }
 
-bool ExtensionUnpacker::DumpImagesToFile() {
+bool Unpacker::DumpImagesToFile() {
   IPC::Message pickle;  // We use a Message so we can use WriteParam.
   IPC::WriteParam(&pickle, decoded_images_);
 
   FilePath path = extension_path_.DirName().AppendASCII(
       filenames::kDecodedImagesFilename);
   if (!file_util::WriteFile(path, static_cast<const char*>(pickle.data()),
                             pickle.size())) {
     SetError("Could not write image data to disk.");
     return false;
   }
 
   return true;
 }
 
-bool ExtensionUnpacker::DumpMessageCatalogsToFile() {
+bool Unpacker::DumpMessageCatalogsToFile() {
   IPC::Message pickle;
   IPC::WriteParam(&pickle, *parsed_catalogs_.get());
 
   FilePath path = extension_path_.DirName().AppendASCII(
       filenames::kDecodedMessageCatalogsFilename);
   if (!file_util::WriteFile(path, static_cast<const char*>(pickle.data()),
                             pickle.size())) {
     SetError("Could not write message catalogs to disk.");
     return false;
   }
 
   return true;
 }
 
 // static
-bool ExtensionUnpacker::ReadImagesFromFile(const FilePath& extension_path,
-                                           DecodedImages* images) {
+bool Unpacker::ReadImagesFromFile(const FilePath& extension_path,
+                                  DecodedImages* images) {
   FilePath path = extension_path.AppendASCII(filenames::kDecodedImagesFilename);
   std::string file_str;
   if (!file_util::ReadFileToString(path, &file_str))
     return false;
 
   IPC::Message pickle(file_str.data(), file_str.size());
   PickleIterator iter(pickle);
   return IPC::ReadParam(&pickle, &iter, images);
 }
 
 // static
-bool ExtensionUnpacker::ReadMessageCatalogsFromFile(
-    const FilePath& extension_path, DictionaryValue* catalogs) {
+bool Unpacker::ReadMessageCatalogsFromFile(const FilePath& extension_path,
+                                           DictionaryValue* catalogs) {
   FilePath path = extension_path.AppendASCII(
       filenames::kDecodedMessageCatalogsFilename);
   std::string file_str;
   if (!file_util::ReadFileToString(path, &file_str))
     return false;
 
   IPC::Message pickle(file_str.data(), file_str.size());
   PickleIterator iter(pickle);
   return IPC::ReadParam(&pickle, &iter, catalogs);
 }
 
-bool ExtensionUnpacker::AddDecodedImage(const FilePath& path) {
+bool Unpacker::AddDecodedImage(const FilePath& path) {
   // Make sure it's not referencing a file outside the extension's subdir.
   if (path.IsAbsolute() || PathContainsParentDirectory(path)) {
     SetError(kPathNamesMustBeAbsoluteOrLocalError);
     return false;
   }
 
   SkBitmap image_bitmap = DecodeImage(temp_install_dir_.Append(path));
   if (image_bitmap.isNull()) {
     SetError(kCouldNotDecodeImageError);
     return false;
   }
 
   decoded_images_.push_back(MakeTuple(image_bitmap, path));
   return true;
 }
 
-bool ExtensionUnpacker::ReadMessageCatalog(const FilePath& message_path) {
+bool Unpacker::ReadMessageCatalog(const FilePath& message_path) {
   std::string error;
   JSONFileValueSerializer serializer(message_path);
   scoped_ptr<DictionaryValue> root(
       static_cast<DictionaryValue*>(serializer.Deserialize(NULL, &error)));
   if (!root.get()) {
     string16 messages_file = message_path.LossyDisplayName();
     if (error.empty()) {
       // If file is missing, Deserialize will fail with empty error.
       SetError(base::StringPrintf("%s %s", errors::kLocalesMessagesFileMissing,
                                   UTF16ToUTF8(messages_file).c_str()));
@@ skipping 15 matching lines @@
   std::string dir_name = relative_path.DirName().MaybeAsASCII();
   if (dir_name.empty()) {
     NOTREACHED();
     return false;
   }
   parsed_catalogs_->Set(dir_name, root.release());
 
   return true;
 }
 
-void ExtensionUnpacker::SetError(const std::string &error) {
+void Unpacker::SetError(const std::string &error) {
   error_message_ = UTF8ToUTF16(error);
 }
+
+}  // namespace extensions