Move ".crx"/".pem" constants and extension_filenames constants into extensions/common/constants.cc.

chrome/browser/extensions/sandboxed_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/browser/extensions/sandboxed_unpacker.h"
 
 #include <set>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_util_proxy.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/scoped_handle.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/utf_string_conversions.h"  // TODO(viettrungluu): delete me.
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_constants.h"
+// #include "chrome/common/extensions/extension_constants.h"

[Matt Perry, 2013/07/19 22:29:11]

remove

[Yoyo Zhou, 2013/07/19 22:50:03]

Oops, done.

 #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/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/common/common_param_traits.h"
 #include "crypto/signature_verifier.h"
 #include "extensions/common/constants.h"
@@ skipping 137 matching lines @@
              << "remote drives or read-only. Installation can not complete!";
   return false;
 }
 
 // Read the decoded images back from the file we saved them to.
 // |extension_path| is the path to the extension we unpacked that wrote the
 // data. Returns true on success.
 bool ReadImagesFromFile(const base::FilePath& extension_path,
                         DecodedImages* images) {
   base::FilePath path =
-      extension_path.AppendASCII(extension_filenames::kDecodedImagesFilename);
+      extension_path.AppendASCII(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);
 }
 
 // Read the decoded message catalogs back from the file we saved them to.
 // |extension_path| is the path to the extension we unpacked that wrote the
 // data. Returns true on success.
 bool ReadMessageCatalogsFromFile(const base::FilePath& extension_path,
                                  base::DictionaryValue* catalogs) {
   base::FilePath path = extension_path.AppendASCII(
-      extension_filenames::kDecodedMessageCatalogsFilename);
+      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);
 }
 
 }  // namespace
@@ skipping 45 matching lines @@
   CHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
 
   unpack_start_time_ = base::TimeTicks::Now();
 
   PATH_LENGTH_HISTOGRAM("Extensions.SandboxUnpackInitialCrxPathLength",
                         crx_path_);
   if (!CreateTempDirectory())
     return;  // ReportFailure() already called.
 
   // Initialize the path that will eventually contain the unpacked extension.
-  extension_root_ = temp_dir_.path().AppendASCII(
-      extension_filenames::kTempExtensionName);
+  extension_root_ = temp_dir_.path().AppendASCII(kTempExtensionName);
   PATH_LENGTH_HISTOGRAM("Extensions.SandboxUnpackUnpackedCrxPathLength",
                         extension_root_);
 
   // Extract the public key and validate the package.
   if (!ValidateSignature())
     return;  // ValidateSignature() already reported the error.
 
   // Copy the crx file into our working directory.
   base::FilePath temp_crx_path = temp_dir_.path().Append(crx_path_.BaseName());
   PATH_LENGTH_HISTOGRAM("Extensions.SandboxUnpackTempCrxPathLength",
@@ skipping 548 matching lines @@
 
 void SandboxedUnpacker::Cleanup() {
   DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
   if (!temp_dir_.Delete()) {
     LOG(WARNING) << "Can not delete temp directory at "
                  << temp_dir_.path().value();
   }
 }
 
 }  // namespace extensions