More pre-MD odds and ends.

chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc

Index: chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc
index d53cd68994c28902ba7e796fb964dd5cbe51a498..7b98ee26453073ab37f72dd727446c501f405bb8 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc
@@ -6,6 +6,7 @@
 
 #include "base/macros.h"
 #include "base/run_loop.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/sessions/session_tab_helper.h"
@@ -118,8 +119,8 @@ IN_PROC_BROWSER_TEST_F(PageActionImageViewInteractiveUITest,
 
   // We need to resize the expected icon to be the size of the page action
   // button for comparison purposes.
-  const gfx::Size size(extension_misc::EXTENSION_ICON_ACTION,
-                       extension_misc::EXTENSION_ICON_ACTION);
+  const gfx::Size size(ExtensionAction::ActionIconSize(),
+                       ExtensionAction::ActionIconSize());
   gfx::ImageSkia bg(new BlankImageSource(size), size);
   expected_icon =
       gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, expected_icon);