Update browserAction.setIcon and pageAction.setIcon for hidpi

chrome/browser/extensions/browser_action_test_util_mac.mm

Index: chrome/browser/extensions/browser_action_test_util_mac.mm
diff --git a/chrome/browser/extensions/browser_action_test_util_mac.mm b/chrome/browser/extensions/browser_action_test_util_mac.mm
index 2eeeffc927f96fab56e15399c1be71ae2c858cf6..f41beefa111febd06e3a32ad8922499661f0901a 100644
--- a/chrome/browser/extensions/browser_action_test_util_mac.mm
+++ b/chrome/browser/extensions/browser_action_test_util_mac.mm
@@ -4,6 +4,7 @@
 
 #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"
@@ -39,6 +40,14 @@ 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];