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

chrome/browser/extensions/extension_ui_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/command_line.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
+using extensions::Manifest;
 
 class ExtensionUITest : public testing::Test {
  public:
   ExtensionUITest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_) {}
 
  protected:
   virtual void SetUp() OVERRIDE {
     // Create an ExtensionService and ManagementPolicy to inject into the
@@ skipping 23 matching lines @@
 
     JSONFileValueSerializer serializer(path);
     value = serializer.Deserialize(NULL, error);
 
     return static_cast<DictionaryValue*>(value);
   }
 
   DictionaryValue* CreateExtensionDetailViewFromPath(
       const FilePath& extension_path,
       const std::vector<ExtensionPage>& pages,
-      Extension::Location location) {
+      Manifest::Location location) {
     std::string error;
 
     FilePath manifest_path = extension_path.Append(
         Extension::kManifestFilename);
     scoped_ptr<DictionaryValue> extension_data(DeserializeJSONTestData(
         manifest_path, &error));
     EXPECT_EQ("", error);
 
     scoped_refptr<Extension> extension(Extension::Create(
         extension_path, location, *extension_data, Extension::REQUIRE_KEY,
@@ skipping 10 matching lines @@
       const FilePath& expected_output_path) {
     std::string error;
 
     scoped_ptr<DictionaryValue> expected_output_data(DeserializeJSONTestData(
         expected_output_path, &error));
     EXPECT_EQ("", error);
 
     // Produce test output.
     scoped_ptr<DictionaryValue> actual_output_data(
         CreateExtensionDetailViewFromPath(
-            extension_path, pages, Extension::INVALID));
+            extension_path, pages, Manifest::INVALID_LOCATION));
 
     // Compare the outputs.
     // Ignore unknown fields in the actual output data.
     std::string paths_details = " - expected (" +
         expected_output_path.MaybeAsASCII() + ") vs. actual (" +
         extension_path.MaybeAsASCII() + ")";
     for (DictionaryValue::key_iterator key = expected_output_data->begin_keys();
         key != expected_output_data->end_keys();
         ++key) {
       Value* expected_value = NULL;
@@ skipping 75 matching lines @@
   expected_output_path = data_test_dir_path.AppendASCII("extensions")
       .AppendASCII("ui")
       .AppendASCII("create_extension_detail_value_expected_output")
       .AppendASCII("good-extension3.json");
 
   pages.clear();
 
   CompareExpectedAndActualOutput(extension_path, pages, expected_output_path);
 }
 
-// Test that using Extension::LOAD for the extension location triggers the
+// Test that using Manifest::LOAD for the extension location triggers the
 // correct values in the details, including location, order, and allow_reload.
 TEST_F(ExtensionUITest, LocationLoadPropagation) {
   FilePath data_test_dir_path, extension_path;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_test_dir_path));
 
   extension_path = data_test_dir_path.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0");
 
   std::vector<ExtensionPage> pages;
 
   scoped_ptr<DictionaryValue> extension_details(
       CreateExtensionDetailViewFromPath(
-          extension_path, pages, Extension::LOAD));
+          extension_path, pages, Manifest::LOAD));
 
   bool ui_allow_reload = false;
   bool ui_is_unpacked = false;
   FilePath::StringType ui_path;
 
   EXPECT_TRUE(extension_details->GetBoolean("allow_reload", &ui_allow_reload));
   EXPECT_TRUE(extension_details->GetBoolean("isUnpacked", &ui_is_unpacked));
   EXPECT_TRUE(extension_details->GetString("path", &ui_path));
   EXPECT_EQ(true, ui_allow_reload);
   EXPECT_EQ(true, ui_is_unpacked);
   EXPECT_EQ(extension_path, FilePath(ui_path));
 }
 
-// Test that using Extension::EXTERNAL_PREF for the extension location triggers
+// Test that using Manifest::EXTERNAL_PREF for the extension location triggers
 // the correct values in the details, including location, order, and
-// allow_reload.  Contrast to Extension::LOAD, which has somewhat different
+// allow_reload.  Contrast to Manifest::LOAD, which has somewhat different
 // values.
 TEST_F(ExtensionUITest, LocationExternalPrefPropagation) {
   FilePath data_test_dir_path, extension_path;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_test_dir_path));
 
   extension_path = data_test_dir_path.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0");
 
   std::vector<ExtensionPage> pages;
 
   scoped_ptr<DictionaryValue> extension_details(
       CreateExtensionDetailViewFromPath(
-          extension_path, pages, Extension::EXTERNAL_PREF));
+          extension_path, pages, Manifest::EXTERNAL_PREF));
 
   bool ui_allow_reload = true;
   bool ui_is_unpacked = true;
   FilePath::StringType ui_path;
 
   EXPECT_TRUE(extension_details->GetBoolean("allow_reload", &ui_allow_reload));
   EXPECT_TRUE(extension_details->GetBoolean("isUnpacked", &ui_is_unpacked));
   EXPECT_FALSE(extension_details->GetString("path", &ui_path));
   EXPECT_FALSE(ui_allow_reload);
   EXPECT_FALSE(ui_is_unpacked);
 }
 
 // Test that the extension path is correctly propagated into the extension
 // details.
 TEST_F(ExtensionUITest, PathPropagation) {
   FilePath data_test_dir_path, extension_path;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_test_dir_path));
 
   extension_path = data_test_dir_path.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0");
 
   std::vector<ExtensionPage> pages;
 
   scoped_ptr<DictionaryValue> extension_details(
       CreateExtensionDetailViewFromPath(
-          extension_path, pages, Extension::LOAD));
+          extension_path, pages, Manifest::LOAD));
 
   FilePath::StringType ui_path;
 
   EXPECT_TRUE(extension_details->GetString("path", &ui_path));
   EXPECT_EQ(extension_path, FilePath(ui_path));
 }