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

chrome/browser/extensions/extension_action_icon_factory_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/browser/extensions/extension_action_icon_factory.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
@@ skipping 77 matching lines @@
 
   virtual ~ExtensionActionIconFactoryTest() {}
 
   void WaitForIconUpdate() {
     quit_in_icon_updated_ = true;
     MessageLoop::current()->Run();
     quit_in_icon_updated_ = false;
   }
 
   scoped_refptr<Extension> CreateExtension(const char* name,
-                                           Extension::Location location) {
+                                           Manifest::Location location) {
     // Create and load an extension.
     FilePath test_file;
     if (!PathService::Get(chrome::DIR_TEST_DATA, &test_file)) {
       EXPECT_FALSE(true);
       return NULL;
     }
     test_file = test_file.AppendASCII("extensions/api_test").AppendASCII(name);
     int error_code = 0;
     std::string error;
     JSONFileValueSerializer serializer(test_file.AppendASCII("manifest.json"));
@@ skipping 61 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactoryTest);
 };
 
 // If there is no default icon, and the icon has not been set using |SetIcon|,
 // the factory should return favicon.
 TEST_F(ExtensionActionIconFactoryTest, NoIcons) {
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default.
   scoped_refptr<Extension> extension(CreateExtension(
-      "browser_action/no_icon", Extension::INVALID));
+      "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
   ExtensionAction* browser_action = GetBrowserAction(*extension);
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
 
   gfx::ImageSkia favicon = GetFavicon();
 
   ExtensionActionIconFactory icon_factory(extension, browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
   EXPECT_TRUE(ImageRepsAreEqual(
       favicon.GetRepresentation(ui::SCALE_FACTOR_100P),
       icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 }
 
 // If the icon has been set using |SetIcon|, the factory should return that
 // icon.
 TEST_F(ExtensionActionIconFactoryTest, AfterSetIcon) {
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default (but has an browser action
   // icon resource).
   scoped_refptr<Extension> extension(CreateExtension(
-      "browser_action/no_icon", Extension::INVALID));
+      "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
   ExtensionAction* browser_action = GetBrowserAction(*extension);
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
 
   gfx::Image set_icon = LoadIcon("browser_action/no_icon/icon.png");
   ASSERT_FALSE(set_icon.IsEmpty());
 
   browser_action->SetIcon(0, set_icon);
@@ skipping 16 matching lines @@
       icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 }
 
 // If there is a default icon, and the icon has not been set using |SetIcon|,
 // the factory should return the default icon.
 TEST_F(ExtensionActionIconFactoryTest, DefaultIcon) {
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default (but has an browser action
   // icon resource).
   scoped_refptr<Extension> extension(CreateExtension(
-      "browser_action/no_icon", Extension::INVALID));
+      "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
   ExtensionAction* browser_action = GetBrowserAction(*extension);
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
 
   gfx::Image default_icon =
       EnsureImageSize(LoadIcon("browser_action/no_icon/icon.png"), 19);
   ASSERT_FALSE(default_icon.IsEmpty());
 
@@ skipping 26 matching lines @@
   icon = icon_factory.GetIcon(1);
 
   EXPECT_TRUE(ImageRepsAreEqual(
       default_icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P),
       icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 
 }
 
 }  // namespace
 }  // namespace extensions