Fix failing ExtensionIconManagerTest.LoadComponentExtensionResource

chrome/browser/extensions/extension_icon_manager_unittest.cc

Index: chrome/browser/extensions/extension_icon_manager_unittest.cc
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc
index b47a72f2f39cfe03ae999363e4caeb23c1ec51e9..fdf18504019a82c30317dddac90fe0085ee4e597 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_unittest.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/id_util.h"
@@ -21,7 +22,7 @@ using extensions::Manifest;
 
 // Our test class that takes care of managing the necessary threads for loading
 // extension icons, and waiting for those loads to happen.
-class ExtensionIconManagerTest : public testing::Test {
+class ExtensionIconManagerTest : public extensions::ExtensionTest {
  public:
   ExtensionIconManagerTest() :
       unwaited_image_loads_(0),
@@ -51,6 +52,7 @@ class ExtensionIconManagerTest : public testing::Test {
 
  private:
   virtual void SetUp() {
+    extensions::ExtensionTest::SetUp();
     file_thread_.Start();
     io_thread_.Start();
   }
@@ -142,6 +144,7 @@ TEST_F(ExtensionIconManagerTest, LoadRemoveLoad) {
 #if defined(FILE_MANAGER_EXTENSION)
 // Tests loading an icon for a component extension.
 TEST_F(ExtensionIconManagerTest, LoadComponentExtensionResource) {
+  scoped_ptr<Profile> profile(new TestingProfile());
   SkBitmap default_icon = GetDefaultIcon();
 
   base::FilePath test_dir;
@@ -160,7 +163,6 @@ TEST_F(ExtensionIconManagerTest, LoadComponentExtensionResource) {
       Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension.get());
 
-  scoped_ptr<Profile> profile(new TestingProfile());
   TestIconManager icon_manager(this);
   // Load the icon and grab the bitmap.
   icon_manager.LoadIcon(profile.get(), extension.get());