Moves extension_icon_image and image_loader to extensions/browser

extensions/browser/image_loader_unittest.cc

Index: extensions/browser/image_loader_unittest.cc
diff --git a/chrome/browser/extensions/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc
similarity index 88%
rename from chrome/browser/extensions/image_loader_unittest.cc
rename to extensions/browser/image_loader_unittest.cc
index 45cff827d7dc8d3d84affa51bcd4f600642d643b..9e6bbe2f8e2fa18896f175d38f9ee03c83196619 100644
--- a/chrome/browser/extensions/image_loader_unittest.cc
+++ b/extensions/browser/image_loader_unittest.cc
@@ -2,15 +2,18 @@
 // 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 "extensions/browser/image_loader.h"
 
+#include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
+#include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.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/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
@@ -32,6 +35,33 @@ using extensions::ImageLoader;
 using extensions::Manifest;
 using extensions::UnloadedExtensionInfo;
 
+namespace {
+
+class TestingComponentExtensionResourceManager
+    : public extensions::ComponentExtensionResourceManager {
+ public:
+  static const int kResourceId;
+
+  TestingComponentExtensionResourceManager() {}
+  virtual ~TestingComponentExtensionResourceManager() {}
+
+ private:
+  // Overridden from extensions::ComponentExtensionResourceManager:
+  virtual bool IsComponentExtensionResource(
+      const base::FilePath& extension_path,
+      const base::FilePath& resource_path,
+      int* resource_id) OVERRIDE {
+    if (!EndsWith(extension_path.MaybeAsASCII(), "file_manager", false))
+      return false;
+    *resource_id = kResourceId;
+    return true;
+  }
+};
+
+const int TestingComponentExtensionResourceManager::kResourceId = 42;
+
+}
+
 class ImageLoaderTest : public testing::Test {
  public:
   ImageLoaderTest()
@@ -111,6 +141,13 @@ class ImageLoaderTest : public testing::Test {
     testing::Test::SetUp();
     file_thread_.Start();
     io_thread_.Start();
+    extensions::ComponentExtensionResourceManager::Set(
+        new TestingComponentExtensionResourceManager());
+  }
+
+  virtual void TearDown() OVERRIDE {
+    extensions::ComponentExtensionResourceManager::Set(NULL);
+    testing::Test::TearDown();
   }
 
   int image_loaded_count_;
@@ -326,12 +363,10 @@ TEST_F(ImageLoaderTest, IsComponentExtensionResource) {
       extension_misc::EXTENSION_ICON_BITTY,
       ExtensionIconSet::MATCH_EXACTLY);
 
-#if defined(OS_CHROMEOS)
   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
+  ASSERT_TRUE(
+      ImageLoader::IsComponentExtensionResource(extension->path(),
+                                                resource.relative_path(),
+                                                &resource_id));
+  ASSERT_EQ(TestingComponentExtensionResourceManager::kResourceId, resource_id);
 }