Revert "BUG=12114"

chrome/browser/extensions/extension_creator.cc

Index: chrome/browser/extensions/extension_creator.cc
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc
index 9abd030b36db33d270eae048cf828e37001149ec..8c38e177f4908fff7afc02c286ef26a341538841 100755
--- a/chrome/browser/extensions/extension_creator.cc
+++ b/chrome/browser/extensions/extension_creator.cc
@@ -12,7 +12,6 @@
 #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"
@@ -21,6 +20,8 @@ namespace {
   const int kRSAKeySize = 1024;
 };
 
+const char ExtensionCreator::kExtensionHeaderMagic[] = "Cr24";
+
 bool ExtensionCreator::InitializeInput(
     const FilePath& extension_dir,
     const FilePath& private_key_path,
@@ -166,14 +167,14 @@ bool ExtensionCreator::WriteCRX(const FilePath& zip_path,
     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());