With enable-action-box add extensions to BrowserActionContainer only if they have preference kBrows…

chrome/browser/ui/views/browser_actions_container_browsertest.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 "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
@@ skipping 215 matching lines @@
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("browser_action")
                                           .AppendASCII("basics")));
   EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
   EnsureExtensionHasIcon(0);
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
   std::string idA = browser_actions_bar()->GetExtensionId(0);
 
   // Force hide this browser action.
   ExtensionService* service = browser()->profile()->GetExtensionService();
-  service->SetBrowserActionVisibility(service->GetExtensionById(idA, false),
-                                      false);
+  service->extension_prefs()->SetBrowserActionVisibility(
+      service->GetExtensionById(idA, false), false);
   EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
 
   ReloadExtension(idA);
 
   // The browser action should become visible again.
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) {
   LOG(INFO) << "Test starting\n" << std::flush;
@@ skipping 24 matching lines @@
       extension->GetResource(extension->browser_action()->default_icon_path()),
       bitmap,
       size);
 
   LOG(INFO) << "Disabling extension\n" << std::flush;
   DisableExtension(extension->id());
   LOG(INFO) << "Enabling extension\n" << std::flush;
   EnableExtension(extension->id());
   LOG(INFO) << "Test ending\n" << std::flush;
 }