Revert "BUG=12114"

chrome/browser/extensions/extension_creator.cc

 // Copyright (c) 2009 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/extension_creator.h"
 
 #include <vector>
 #include <string>
 
 #include "base/crypto/rsa_private_key.h"
 #include "base/crypto/signature_creator.h"
 #include "base/file_util.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
-#include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/zip.h"
 #include "net/base/base64.h"
 
 namespace {
   const int kRSAKeySize = 1024;
 };
 
+const char ExtensionCreator::kExtensionHeaderMagic[] = "Cr24";
+
 bool ExtensionCreator::InitializeInput(
     const FilePath& extension_dir,
     const FilePath& private_key_path,
     const FilePath& private_key_output_path) {
   // Validate input |extension_dir|.
   if (extension_dir.value().empty() ||
       !file_util::DirectoryExists(extension_dir)) {
     error_message_ = "Input directory must exist.";
     return false;
   }
@@ skipping 125 matching lines @@
   if (file_util::PathExists(crx_path))
     file_util::Delete(crx_path, false);
   ScopedStdioHandle crx_handle(file_util::OpenFile(crx_path, "wb"));
 
   std::vector<uint8> public_key;
   if (!private_key->ExportPublicKey(&public_key)) {
     error_message_ = "Failed to export public key.";
     return false;
   }
 
-  ExtensionsService::ExtensionHeader header;
-  memcpy(&header.magic, ExtensionsService::kExtensionHeaderMagic,
-         ExtensionsService::kExtensionHeaderMagicSize);
-  header.version = ExtensionsService::kCurrentVersion;
+  ExtensionCreator::ExtensionHeader header;
+  memcpy(&header.magic, ExtensionCreator::kExtensionHeaderMagic,
+         ExtensionCreator::kExtensionHeaderMagicSize);
+  header.version = kCurrentVersion;
   header.key_size = public_key.size();
   header.signature_size = signature.size();
 
-  fwrite(&header, sizeof(ExtensionsService::ExtensionHeader), 1,
+  fwrite(&header, sizeof(ExtensionCreator::ExtensionHeader), 1,
       crx_handle.get());
   fwrite(&public_key.front(), sizeof(uint8), public_key.size(),
       crx_handle.get());
   fwrite(&signature.front(), sizeof(uint8), signature.size(),
       crx_handle.get());
 
   uint8 buffer[1 << 16];
   int bytes_read = -1;
   ScopedStdioHandle zip_handle(file_util::OpenFile(zip_path, "rb"));
   while ((bytes_read = fread(buffer, 1, sizeof(buffer),
@@ skipping 29 matching lines @@
   bool result = false;
   if (CreateZip(extension_dir, &zip_path) &&
       SignZip(zip_path, key_pair.get(), &signature) &&
       WriteCRX(zip_path, key_pair.get(), signature, crx_path)) {
     result = true;
   }
 
   file_util::Delete(zip_path, false);
   return result;
 }