Move Icons out of Extension class

chrome/common/extensions/extension_file_util_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/common/extensions/extension_file_util.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h"
 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_handler.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 using extensions::Manifest;
 
 namespace keys = extension_manifest_keys;
 
 class ExtensionFileUtilTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
     extensions::ManifestHandler::Register(
+        extension_manifest_keys::kIcons,
+        make_linked_ptr(new extensions::IconsHandler));
+    extensions::ManifestHandler::Register(
         keys::kBrowserAction,
         make_linked_ptr(new extensions::BrowserActionHandler));
     linked_ptr<extensions::PageActionHandler> page_action_handler(
         new extensions::PageActionHandler);
     extensions::ManifestHandler::Register(keys::kPageAction,
                                           page_action_handler);
     extensions::ManifestHandler::Register(keys::kPageActions,
                                           page_action_handler);
     extensions::ManifestHandler::Register(
         keys::kDefaultLocale,
@@ skipping 569 matching lines @@
   scoped_refptr<Extension> extension3(extension_file_util::LoadExtension(
       ext_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension3 == NULL);
   ASSERT_STREQ("Could not load icon 'icon.png' for page action.",
       error.c_str());
 }
 
 // TODO(aa): More tests as motivation allows. Maybe steal some from
 // ExtensionService? Many of them could probably be tested here without the
 // MessageLoop shenanigans.