Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

chrome/common/extensions/extension_file_util_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 "chrome/common/extensions/extension_file_util.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_handler.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
+using extensions::Manifest;
 
 namespace keys = extension_manifest_keys;
 
 class ExtensionFileUtilTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
     extensions::ManifestHandler::Register(
         extension_manifest_keys::kBrowserAction,
         new extensions::BrowserActionHandler);
@@ skipping 82 matching lines @@
   FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
-      install_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      install_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension != NULL);
   EXPECT_EQ("The first extension that I made.", extension->description());
 }
 
 TEST_F(ExtensionFileUtilTest, LoadExtensionWithoutLocalesFolder) {
   FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
       .AppendASCII("1.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
-      install_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      install_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_FALSE(extension == NULL);
   EXPECT_TRUE(error.empty());
 }
 
 #if defined(OS_WIN)
 // http://crbug.com/106381
 #define CheckIllegalFilenamesNoUnderscores \
     DISABLED_CheckIllegalFilenamesNoUnderscores
 #endif
 TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesNoUnderscores) {
@@ skipping 53 matching lines @@
   FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("dddddddddddddddddddddddddddddddd")
       .AppendASCII("1.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
-      install_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      install_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension == NULL);
   ASSERT_FALSE(error.empty());
   ASSERT_STREQ("Manifest file is missing or unreadable.", error.c_str());
 }
 
 TEST_F(ExtensionFileUtilTest, LoadExtensionGivesHelpfullErrorOnBadManifest) {
   FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee")
       .AppendASCII("1.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
-      install_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      install_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension == NULL);
   ASSERT_FALSE(error.empty());
   ASSERT_STREQ("Manifest is not valid JSON.  "
                "Line: 2, column: 16, Syntax error.", error.c_str());
 }
 
 TEST_F(ExtensionFileUtilTest, FailLoadingNonUTF8Scripts) {
   FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("bad_encoding");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
-      install_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      install_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension == NULL);
   ASSERT_STREQ("Could not load file 'bad_encoding.js' for content script. "
                "It isn't UTF-8 encoded.", error.c_str());
 }
 
 TEST_F(ExtensionFileUtilTest, ExtensionURLToRelativeFilePath) {
 #define URL_PREFIX "chrome-extension://extension-id/"
   struct TestCase {
     const char* url;
     const char* expected_relative_path;
@@ skipping 100 matching lines @@
     EXPECT_EQ(expected_path.value(), actual_path.value()) <<
       " For the path " << url;
   }
   // Remove temp files.
   ASSERT_TRUE(file_util::Delete(root_path, true));
 }
 
 static scoped_refptr<Extension> LoadExtensionManifest(
     DictionaryValue* manifest,
     const FilePath& manifest_dir,
-    Extension::Location location,
+    Manifest::Location location,
     int extra_flags,
     std::string* error) {
   scoped_refptr<Extension> extension = Extension::Create(
       manifest_dir, location, *manifest, extra_flags, error);
   return extension;
 }
 
 static scoped_refptr<Extension> LoadExtensionManifest(
     const std::string& manifest_value,
     const FilePath& manifest_dir,
-    Extension::Location location,
+    Manifest::Location location,
     int extra_flags,
     std::string* error) {
   JSONStringValueSerializer serializer(manifest_value);
   scoped_ptr<Value> result(serializer.Deserialize(NULL, error));
   if (!result.get())
     return NULL;
   CHECK_EQ(Value::TYPE_DICTIONARY, result->GetType());
   return LoadExtensionManifest(static_cast<DictionaryValue*>(result.get()),
                                manifest_dir,
                                location,
@@ skipping 15 matching lines @@
       non_ascii_file));
   file_util::WriteFile(non_ascii_path, "", 0);
 
   std::string kManifest =
       base::StringPrintf(
           "{ \"name\": \"Test\", \"version\": \"1.0\", "
           "  \"theme\": { \"images\": { \"theme_frame\": \"%s\" } }"
           "}", non_ascii_file.c_str());
   std::string error;
   scoped_refptr<Extension> extension = LoadExtensionManifest(
-      kManifest, temp.path(), Extension::LOAD, 0, &error);
+      kManifest, temp.path(), Manifest::LOAD, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
-  Extension::InstallWarningVector warnings;
+  std::vector<extensions::InstallWarning> warnings;
   EXPECT_TRUE(extension_file_util::ValidateExtension(extension,
                                                      &error, &warnings)) <<
       error;
   EXPECT_EQ(0U, warnings.size());
 }
 
 #if defined(OS_WIN)
 // This test hangs on Windows sometimes. http://crbug.com/110279
 #define MAYBE_BackgroundScriptsMustExist DISABLED_BackgroundScriptsMustExist
 #else
 #define MAYBE_BackgroundScriptsMustExist BackgroundScriptsMustExist
 #endif
 TEST_F(ExtensionFileUtilTest, MAYBE_BackgroundScriptsMustExist) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   scoped_ptr<DictionaryValue> value(new DictionaryValue());
   value->SetString("name", "test");
   value->SetString("version", "1");
   value->SetInteger("manifest_version", 1);
 
   ListValue* scripts = new ListValue();
   scripts->Append(Value::CreateStringValue("foo.js"));
   value->Set("background.scripts", scripts);
 
   std::string error;
-  Extension::InstallWarningVector warnings;
+  std::vector<extensions::InstallWarning> warnings;
   scoped_refptr<Extension> extension = LoadExtensionManifest(
-      value.get(), temp.path(), Extension::LOAD, 0, &error);
+      value.get(), temp.path(), Manifest::LOAD, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   EXPECT_FALSE(extension_file_util::ValidateExtension(extension,
                                                       &error, &warnings));
   EXPECT_EQ(l10n_util::GetStringFUTF8(
       IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED, ASCIIToUTF16("foo.js")),
            error);
   EXPECT_EQ(0U, warnings.size());
 
   scripts->Clear();
   scripts->Append(Value::CreateStringValue("http://google.com/foo.js"));
 
-  extension = LoadExtensionManifest(value.get(), temp.path(), Extension::LOAD,
+  extension = LoadExtensionManifest(value.get(), temp.path(), Manifest::LOAD,
                                     0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   warnings.clear();
   EXPECT_FALSE(extension_file_util::ValidateExtension(extension,
                                                       &error, &warnings));
   EXPECT_EQ(l10n_util::GetStringFUTF8(
       IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
       ASCIIToUTF16("http://google.com/foo.js")),
            error);
@@ skipping 60 matching lines @@
       "  \"manifest_version\": 2,\n"
       "  \"description\": \"The first extension that I made.\"\n"
       "}\n";
   ASSERT_TRUE(file_util::WriteFile(ext_path.AppendASCII("manifest.json"),
                                    manifest, strlen(manifest)));
   ASSERT_TRUE(file_util::WriteFile(ext_path.AppendASCII("a_key.pem"),
                                    private_key, strlen(private_key)));
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
-      ext_path, "the_id", Extension::EXTERNAL_PREF,
+      ext_path, "the_id", Manifest::EXTERNAL_PREF,
       Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension.get()) << error;
   ASSERT_EQ(1u, extension->install_warnings().size());
   EXPECT_THAT(
       extension->install_warnings(),
       testing::ElementsAre(
           testing::Field(
-              &Extension::InstallWarning::message,
+              &extensions::InstallWarning::message,
               testing::ContainsRegex(
                   "extension includes the key file.*ext_root.a_key.pem"))));
 
   // Turn the warning into an error with ERROR_ON_PRIVATE_KEY.
   extension = extension_file_util::LoadExtension(
-      ext_path, "the_id", Extension::EXTERNAL_PREF,
+      ext_path, "the_id", Manifest::EXTERNAL_PREF,
       Extension::ERROR_ON_PRIVATE_KEY, &error);
   EXPECT_FALSE(extension.get());
   EXPECT_THAT(error,
               testing::ContainsRegex(
                   "extension includes the key file.*ext_root.a_key.pem"));
 }
 
 TEST_F(ExtensionFileUtilTest, CheckZeroLengthImageFile) {
   FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
 
   // Try to install an extension with a zero-length icon file.
   FilePath ext_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("ffffffffffffffffffffffffffffffff");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
-      ext_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      ext_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension == NULL);
   ASSERT_STREQ("Could not load extension icon 'icon.png'.",
       error.c_str());
 
   // Try to install an extension with a zero-length browser action icon file.
   ext_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("gggggggggggggggggggggggggggggggg");
 
   scoped_refptr<Extension> extension2(extension_file_util::LoadExtension(
-      ext_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      ext_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension2 == NULL);
   ASSERT_STREQ("Could not load icon 'icon.png' for browser action.",
       error.c_str());
 
   // Try to install an extension with a zero-length page action icon file.
   ext_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh");
 
   scoped_refptr<Extension> extension3(extension_file_util::LoadExtension(
-      ext_dir, Extension::LOAD, Extension::NO_FLAGS, &error));
+      ext_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension3 == NULL);
   ASSERT_STREQ("Could not load icon 'icon.png' for page action.",
       error.c_str());
 }
 
 // TODO(aa): More tests as motivation allows. Maybe steal some from
 // ExtensionService? Many of them could probably be tested here without the
 // MessageLoop shenanigans.