Move ImageLoaderTest to extensions_unittests

extensions/browser/image_loader_unittest.cc

Index: extensions/browser/image_loader_unittest.cc
diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc
index 39ae9e207736b8b8fe652fb4d99f2f3464eea3bd..6f8f1209e2a6179bade8ce1d5011b7f5cff49197 100644
--- a/extensions/browser/image_loader_unittest.cc
+++ b/extensions/browser/image_loader_unittest.cc
@@ -9,15 +9,14 @@
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
-#include "chrome/common/chrome_paths.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
-#include "extensions/browser/component_extension_resource_manager.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
+#include "extensions/common/extension_paths.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
@@ -28,11 +27,8 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
 
-#if defined(OS_CHROMEOS)
-#include "ui/file_manager/grit/file_manager_resources.h"
-#endif
-
 using content::BrowserThread;
+using content::NotificationService;
 using extensions::Extension;
 using extensions::ExtensionResource;
 using extensions::ImageLoader;
@@ -46,8 +42,8 @@ class ImageLoaderTest : public testing::Test {
         quit_in_image_loaded_(false),
         ui_thread_(BrowserThread::UI, &ui_loop_),
         file_thread_(BrowserThread::FILE),
-        io_thread_(BrowserThread::IO) {
-  }
+        io_thread_(BrowserThread::IO),
+        notification_service_(NotificationService::Create()) {}
 
   void OnImageLoaded(const gfx::Image& image) {
     image_loaded_count_++;
@@ -79,12 +75,11 @@ class ImageLoaderTest : public testing::Test {
                                            Manifest::Location location) {
     // Create and load an extension.
     base::FilePath test_file;
-    if (!PathService::Get(chrome::DIR_TEST_DATA, &test_file)) {
+    if (!PathService::Get(extensions::DIR_TEST_DATA, &test_file)) {
       EXPECT_FALSE(true);
       return NULL;
     }
-    test_file = test_file.AppendASCII("extensions")
-                         .AppendASCII(name);
+    test_file = test_file.AppendASCII(name);
     int error_code = 0;
     std::string error;
     JSONFileValueSerializer serializer(test_file.AppendASCII("app.json"));
@@ -99,13 +94,6 @@ class ImageLoaderTest : public testing::Test {
     if (!valid_value)
       return NULL;
 
-    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);
   }
@@ -126,12 +114,13 @@ class ImageLoaderTest : public testing::Test {
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
+  scoped_ptr<NotificationService> notification_service_;
 };
 
 // Tests loading an image works correctly.
 TEST_F(ImageLoaderTest, LoadImage) {
-  scoped_refptr<Extension> extension(CreateExtension(
-      "image_loading_tracker", Manifest::INVALID_LOCATION));
+  scoped_refptr<Extension> extension(
+      CreateExtension("image_loader", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource = extensions::IconsInfo::GetIconResource(
@@ -163,8 +152,8 @@ TEST_F(ImageLoaderTest, LoadImage) {
 // 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", Manifest::INVALID_LOCATION));
+  scoped_refptr<Extension> extension(
+      CreateExtension("image_loader", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource = extensions::IconsInfo::GetIconResource(
@@ -210,8 +199,8 @@ TEST_F(ImageLoaderTest, DeleteExtensionWhileWaitingForCache) {
 
 // Tests loading multiple dimensions of the same image.
 TEST_F(ImageLoaderTest, MultipleImages) {
-  scoped_refptr<Extension> extension(CreateExtension(
-      "image_loading_tracker", Manifest::INVALID_LOCATION));
+  scoped_refptr<Extension> extension(
+      CreateExtension("image_loader", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   std::vector<ImageLoader::ImageRepresentation> info_list;
@@ -256,7 +245,7 @@ TEST_F(ImageLoaderTest, MultipleImages) {
 // Tests loading multiple dimensions of the same image into an image family.
 TEST_F(ImageLoaderTest, LoadImageFamily) {
   scoped_refptr<Extension> extension(
-      CreateExtension("image_loading_tracker", Manifest::INVALID_LOCATION));
+      CreateExtension("image_loader", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   std::vector<ImageLoader::ImageRepresentation> info_list;
@@ -321,31 +310,3 @@ TEST_F(ImageLoaderTest, LoadImageFamily) {
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH, img_rep2->pixel_width());
   EXPECT_EQ(2.0f, img_rep2->scale());
 }
-
-// Tests IsComponentExtensionResource function.
-// TODO(mukai): move this to ChromeComponentExtensionResourceManager's test.
-TEST_F(ImageLoaderTest, IsComponentExtensionResource) {
-  extensions::ComponentExtensionResourceManager* resource_manager =
-      extensions::ExtensionsBrowserClient::Get()->
-      GetComponentExtensionResourceManager();
-  if (!resource_manager)
-    return;
-
-  scoped_refptr<Extension> extension(CreateExtension(
-      "file_manager", Manifest::COMPONENT));
-  ASSERT_TRUE(extension.get() != NULL);
-
-  ExtensionResource resource = extensions::IconsInfo::GetIconResource(
-      extension.get(),
-      extension_misc::EXTENSION_ICON_BITTY,
-      ExtensionIconSet::MATCH_EXACTLY);
-
-#if defined(OS_CHROMEOS)
-  int resource_id;
-  ASSERT_TRUE(resource_manager->IsComponentExtensionResource(
-      extension->path(),
-      resource.relative_path(),
-      &resource_id));
-  ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id);
-#endif
-}