Move default_locale out of Extension class

chrome/common/extensions/unpacker_unittest.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 "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/unpacker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace errors = extension_manifest_errors;
 namespace filenames = extension_filenames;
 namespace keys = extension_manifest_keys;
 
 namespace extensions {
 
 class UnpackerTest : public testing::Test {
 public:
   ~UnpackerTest() {
     LOG(WARNING) << "Deleting temp dir: "
                  << temp_dir_.path().LossyDisplayName();
     LOG(WARNING) << temp_dir_.Delete();
   }
 
+  virtual void SetUp() OVERRIDE {

[Devlin, 2013/01/18 21:08:46]

Call the super's SetUp().

[Joe Thomas, 2013/01/18 22:16:57]

Done.

+    extensions::ManifestHandler::Register(keys::kDefaultLocale,
+                                          new extensions::DefaultLocaleHandler);
+  }
+
   void SetupUnpacker(const std::string& crx_name) {
     FilePath original_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &original_path));
     original_path = original_path.AppendASCII("extensions")
         .AppendASCII("unpacker")
         .AppendASCII(crx_name);
     ASSERT_TRUE(file_util::PathExists(original_path)) << original_path.value();
 
     // Try bots won't let us write into DIR_TEST_DATA, so we have to create
     // a temp folder to play in.
@@ skipping 220 matching lines @@
   SetupUnpacker("bad_image.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_TRUE(StartsWith(unpacker_->error_message(),
               ASCIIToUTF16(kExpected),
               false)) << "Expected prefix: \"" << kExpected
                       << "\", actual error: \"" << unpacker_->error_message()
                       << "\"";
 }
 
 }  // namespace extensions