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

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

 // Copyright (c) 2012 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 "base/command_line.h"
 #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"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 
 // These are a mash-up of the tests from from page_actions_apitest.cc and
 // browser_actions_apitest.cc.
 
 namespace {
 
 class PageAsBrowserActionApiTest : public ExtensionApiTest {
  public:
   PageAsBrowserActionApiTest() {}
   virtual ~PageAsBrowserActionApiTest() {}
 
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableBrowserActionsForAll);
+    command_line->AppendSwitch(switches::kEnableActionBox);
   }
 
  protected:
   BrowserActionTestUtil GetBrowserActionsBar() {
     return BrowserActionTestUtil(browser());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;
   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());
 
   {
     // Tell the extension to update the page action state.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
@@ skipping 105 matching lines @@
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }