Move Icons out of Extension class

chrome/browser/ui/views/browser_actions_container_browsertest.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/browser/ui/views/browser_actions_container.h"
 
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/test/test_utils.h"
 
 using extensions::Extension;
 
 class BrowserActionsContainerTest : public ExtensionBrowserTest {
  public:
   BrowserActionsContainerTest() {
@@ skipping 232 matching lines @@
       test_data_dir_.AppendASCII("api_test")
       .AppendASCII("browser_action")
       .AppendASCII("crash_57536"));
   ASSERT_TRUE(extension);
 
   LOG(INFO) << "Creating bitmap\n" << std::flush;
 
   // Create and cache and empty bitmap.
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                    Extension::kBrowserActionIconMaxSize,
-                    Extension::kBrowserActionIconMaxSize);
+                   extensions::IconsInfo::kBrowserActionIconMaxSize,
+                   extensions::IconsInfo::kBrowserActionIconMaxSize);
   bitmap.allocPixels();
 
   LOG(INFO) << "Set as cached image\n" << std::flush;
 
-  gfx::Size size(Extension::kBrowserActionIconMaxSize,
-                 Extension::kBrowserActionIconMaxSize);
+  gfx::Size size(extensions::IconsInfo::kBrowserActionIconMaxSize,
+                 extensions::IconsInfo::kBrowserActionIconMaxSize);
   const ExtensionIconSet* default_icon =
       extensions::ExtensionActionManager::Get(browser()->profile())->
       GetBrowserAction(*extension)->default_icon();
   const std::string path =
       default_icon->Get(extension_misc::EXTENSION_ICON_ACTION,
                         ExtensionIconSet::MATCH_EXACTLY);
 
   extension->SetCachedImage(extension->GetResource(path), bitmap, size);
 
   LOG(INFO) << "Disabling extension\n" << std::flush;
   DisableExtension(extension->id());
   LOG(INFO) << "Enabling extension\n" << std::flush;
   EnableExtension(extension->id());
   LOG(INFO) << "Test ending\n" << std::flush;
 }