Fully merge the implementations of the browserAction and pageAction APIs

chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc

Index: chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc
diff --git a/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc b/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc
index dd11787d4acfca62fb94ef06ad20c2df2e9ea919..5400265ef295b53d2ef08947e118da973df1ada8 100644
--- a/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc
@@ -5,19 +5,22 @@
 #include <string>
 
 #include "base/values.h"
+#include "chrome/browser/extensions/api/extension_action/extension_actions_api.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 void RunPassTest(const std::string& css_string, SkColor expected_result) {
   SkColor color = 0;
-  EXPECT_TRUE(BrowserActionFunction::ParseCSSColorString(css_string, &color));
+  EXPECT_TRUE(
+      ExtensionActionFunction::ParseCSSColorString(css_string, &color));
   EXPECT_EQ(color, expected_result);
 }
 
 void RunFailTest(const std::string& css_string) {
   SkColor color = 0;
-  EXPECT_FALSE(BrowserActionFunction::ParseCSSColorString(css_string, &color));
+  EXPECT_FALSE(
+      ExtensionActionFunction::ParseCSSColorString(css_string, &color));
 }
 
 TEST(ExtensionBrowserActionsApiTest, ChangeBadgeBackgroundNormalCSS) {