| Index: chrome/browser/ui/views/browser_actions_container_browsertest.cc
|
| diff --git a/chrome/browser/ui/views/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
|
| index 3849eebf2342e35df1f020213827621db72271f2..a54b25982f28de355a7496d5ebadd375da3f1dd1 100644
|
| --- a/chrome/browser/ui/views/browser_actions_container_browsertest.cc
|
| +++ b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
|
| @@ -13,6 +13,7 @@
|
| #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"
|
| @@ -265,14 +266,14 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) {
|
| // 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();
|
|
|