Enable tabbed bookmark manager by default.

BUG=4890
TEST=None 
		
Review URL: http://codereview.chromium.org/1139001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42061 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 5 deletions

diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index b554fa1..a14e7b6 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -309,6 +309,9 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoDragging) {
   const char kTooltipA[] = "Make this page red";
   const char kTooltipB[] = "grow";
   const char kTooltipC[] = "Test setPopup()";
+
+  const size_t size_before = service->extensions()->size();
+
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "browser_action/basics")));
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
@@ -317,15 +320,15 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoDragging) {
       "browser_action/add_popup")));
 
   // Test that there are 3 browser actions in the toolbar.
-  ASSERT_EQ(3u, service->extensions()->size());
+  ASSERT_EQ(size_before + 3, service->extensions()->size());
   ASSERT_EQ(3, GetBrowserActionsBar().NumberOfBrowserActions());
 
   // Now enable 2 of the extensions in incognito mode, and test that the browser
   // actions show up.
   service->extension_prefs()->SetIsIncognitoEnabled(
-      service->extensions()->at(0)->id(), true);
+      service->extensions()->at(size_before)->id(), true);
   service->extension_prefs()->SetIsIncognitoEnabled(
-      service->extensions()->at(2)->id(), true);
+      service->extensions()->at(size_before + 2)->id(), true);
 
   Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile();
   Browser* incognito_browser = Browser::Create(incognito_profile);
@@ -349,7 +352,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoDragging) {
   // regular and incognito mode.
 
   // ABC -> CAB
-  service->toolbar_model()->MoveBrowserAction(service->extensions()->at(2), 0);
+  service->toolbar_model()->MoveBrowserAction(
+      service->extensions()->at(size_before + 2), 0);
 
   EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(0));
   EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(1));
@@ -359,7 +363,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoDragging) {
   EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(1));
 
   // CAB -> CBA
-  service->toolbar_model()->MoveBrowserAction(service->extensions()->at(1), 1);
+  service->toolbar_model()->MoveBrowserAction(
+      service->extensions()->at(size_before + 1), 1);
 
   EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(0));
   EXPECT_EQ(kTooltipB, GetBrowserActionsBar().GetTooltip(1));