Update browserAction.setIcon and pageAction.setIcon for hidpi

chrome/browser/extensions/browser_action_test_util_mac.mm

 // Copyright (c) 2009 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 "browser_action_test_util.h"
 
+#include "base/mac/foundation_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
@@ skipping 15 matching lines @@
 }  // namespace
 
 int BrowserActionTestUtil::NumberOfBrowserActions() {
   return [GetController(browser_) buttonCount];
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
   return [GetButton(browser_, index) image] != nil;
 }
 
+uint32 BrowserActionTestUtil::GetIconID(int index) {
+  NSImage* ns_image = [GetButton(browser_, index) image];
+  // |ns_image| will be released by gfx::Image. Retain it here so it doesn't go
+  // away prematurely.
+  base::mac::NSObjectRetain(ns_image);
+  return gfx::Image(ns_image).AsBitmap().getGenerationID();
+}
+
 void BrowserActionTestUtil::Press(int index) {
   NSButton* button = GetButton(browser_, index);
   [button performClick:nil];
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {
   NSString* tooltip = [GetButton(browser_, index) toolTip];
   return base::SysNSStringToUTF8(tooltip);
 }
 
@@ skipping 14 matching lines @@
   return !HasPopup();
 }
 
 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {
   return gfx::Size(NSSizeToCGSize([ExtensionPopupController minPopupSize]));
 }
 
 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
   return gfx::Size(NSSizeToCGSize([ExtensionPopupController maxPopupSize]));
 }