Move CrxFile, FileReader, ExtensionResource to src/extensions.

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 26495b2a76761b08e38856f90b9fb1f6bc204fd3..b47a72f2f39cfe03ae999363e4caeb23c1ec51e9 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -9,9 +9,9 @@
 #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_resource.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
+#include "extensions/common/id_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/skia_util.h"
 
@@ -93,8 +93,7 @@ class TestIconManager : public ExtensionIconManager {
 // Returns the default icon that ExtensionIconManager gives when an extension
 // doesn't have an icon.
 SkBitmap GetDefaultIcon() {
-  std::string dummy_id;
-  EXPECT_TRUE(Extension::GenerateId(std::string("whatever"), &dummy_id));
+  std::string dummy_id = extensions::id_util::GenerateId("whatever");
   ExtensionIconManager manager;
   return manager.GetIcon(dummy_id);
 }