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

chrome/browser/extensions/image_loader_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/image_loader.h"
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "chrome/common/extensions/manifest.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "grit/component_extension_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::ImageLoader;
+using extensions::Manifest;
 
 class ImageLoaderTest : public testing::Test {
  public:
   ImageLoaderTest()
       : image_loaded_count_(0),
         quit_in_image_loaded_(false),
         ui_thread_(BrowserThread::UI, &ui_loop_),
         file_thread_(BrowserThread::FILE),
         io_thread_(BrowserThread::IO) {
   }
@@ skipping 11 matching lines @@
     quit_in_image_loaded_ = false;
   }
 
   int image_loaded_count() {
     int result = image_loaded_count_;
     image_loaded_count_ = 0;
     return result;
   }
 
   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")
                          .AppendASCII(name);
     int error_code = 0;
     std::string error;
     JSONFileValueSerializer serializer(test_file.AppendASCII("app.json"));
     scoped_ptr<DictionaryValue> valid_value(
         static_cast<DictionaryValue*>(serializer.Deserialize(&error_code,
                                                              &error)));
     EXPECT_EQ(0, error_code) << error;
     if (error_code != 0)
       return NULL;
 
     EXPECT_TRUE(valid_value.get());
     if (!valid_value.get())
       return NULL;
 
-    if (location == Extension::COMPONENT) {
+    if (location == Manifest::COMPONENT) {
       if (!PathService::Get(chrome::DIR_RESOURCES, &test_file)) {
         EXPECT_FALSE(true);
         return NULL;
       }
       test_file = test_file.AppendASCII(name);
     }
     return Extension::Create(test_file, location, *valid_value,
                              Extension::NO_FLAGS, &error);
   }
 
   gfx::Image image_;
 
  private:
   virtual void SetUp() {
     file_thread_.Start();
     io_thread_.Start();
   }
 
   int image_loaded_count_;
   bool quit_in_image_loaded_;
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
 };
 
 // Tests loading an image works correctly.
 TEST_F(ImageLoaderTest, LoadImage) {
   scoped_refptr<Extension> extension(CreateExtension(
-      "image_loading_tracker", Extension::INVALID));
+      "image_loading_tracker", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
       extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALLISH,
                                  ExtensionIconSet::MATCH_EXACTLY);
   gfx::Size max_size(extension_misc::EXTENSION_ICON_SMALLISH,
                      extension_misc::EXTENSION_ICON_SMALLISH);
   ImageLoader loader;
   loader.LoadImageAsync(extension.get(),
                         image_resource,
@@ skipping 11 matching lines @@
 
   // Check that the image was loaded.
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
             image_.ToSkBitmap()->width());
 }
 
 // Tests deleting an extension while waiting for the image to load doesn't cause
 // problems.
 TEST_F(ImageLoaderTest, DeleteExtensionWhileWaitingForCache) {
   scoped_refptr<Extension> extension(CreateExtension(
-      "image_loading_tracker", Extension::INVALID));
+      "image_loading_tracker", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
       extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALLISH,
                                  ExtensionIconSet::MATCH_EXACTLY);
   gfx::Size max_size(extension_misc::EXTENSION_ICON_SMALLISH,
                      extension_misc::EXTENSION_ICON_SMALLISH);
   ImageLoader loader;
   std::set<int> sizes;
   sizes.insert(extension_misc::EXTENSION_ICON_SMALLISH);
@@ skipping 25 matching lines @@
   EXPECT_EQ(1, image_loaded_count());
 
   // Check that the image was loaded.
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
             image_.ToSkBitmap()->width());
 }
 
 // Tests loading multiple dimensions of the same image.
 TEST_F(ImageLoaderTest, MultipleImages) {
   scoped_refptr<Extension> extension(CreateExtension(
-      "image_loading_tracker", Extension::INVALID));
+      "image_loading_tracker", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   std::vector<ImageLoader::ImageRepresentation> info_list;
   int sizes[] = {extension_misc::EXTENSION_ICON_SMALLISH,
                  extension_misc::EXTENSION_ICON_BITTY};
   for (size_t i = 0; i < arraysize(sizes); ++i) {
     ExtensionResource resource =
         extension->GetIconResource(sizes[i], ExtensionIconSet::MATCH_EXACTLY);
     info_list.push_back(ImageLoader::ImageRepresentation(
         resource,
@@ skipping 26 matching lines @@
   }
   EXPECT_EQ(extension_misc::EXTENSION_ICON_BITTY,
             img_rep1->pixel_width());
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
             img_rep2->pixel_width());
 }
 
 // Tests IsComponentExtensionResource function.
 TEST_F(ImageLoaderTest, IsComponentExtensionResource) {
   scoped_refptr<Extension> extension(CreateExtension(
-      "file_manager", Extension::COMPONENT));
+      "file_manager", Manifest::COMPONENT));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource resource =
       extension->GetIconResource(extension_misc::EXTENSION_ICON_BITTY,
                                  ExtensionIconSet::MATCH_EXACTLY);
 
 #if defined(FILE_MANAGER_EXTENSION)
   int resource_id;
   ASSERT_EQ(true,
             ImageLoader::IsComponentExtensionResource(extension->path(),
                                                       resource.relative_path(),
                                                       &resource_id));
   ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id);
 #endif
 }