Remove browser-actions-for-all flag and replace funcionality with action-box.

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

Index: chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc
index c941923f2fb4e477f4c5c70d9aaf97ba435cdd95..9d810e97cb51ade44261c00c51edb329a6514dca 100644
--- a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc
@@ -6,6 +6,7 @@
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
+#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ -32,7 +33,7 @@ class PageAsBrowserActionApiTest : public ExtensionApiTest {
 
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableBrowserActionsForAll);
+    command_line->AppendSwitch(switches::kEnableActionBox);
   }
 
  protected:
@@ -47,6 +48,16 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
+  // The extension declares a page action, but it should have gotten a browser
+  // action instead.
+  ASSERT_TRUE(extension->browser_action());
+  ASSERT_FALSE(extension->page_action());
+
+  // With the "action box" there won't be browser actions unless they're pinned.
+  ExtensionPrefs* prefs =
+      browser()->profile()->GetExtensionService()->extension_prefs();
+  prefs->SetBrowserActionVisibility(extension, true);
+
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());