Enable tabbed bookmark manager by default.

Second try with the following changes:

- Remove FLAKY_ from Feed tests and makes sure they pass.

BUG=4890,38609
TEST=browser_test.exe
     Run Chrome, Press Ctrl+Shift+B. The new bookmark manager should open in a tab.

Review URL: http://codereview.chromium.org/1127006

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

2 files changed, 5 insertions, 4 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index a440c55..9551080 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -177,6 +177,10 @@ const char kDisableSyncPreferences[]        = "disable-sync-preferences";
 // Disable syncing of typed urls.
 const char kDisableSyncTypedUrls[]          = "disable-sync-typed-urls";
 
+// Disable the tabbed bookmark manager. This makes us use the native bookmark
+// manager instead.
+const char kDisableTabbedBookmarkManager[]  = "disable-tabbed-bookmark-manager";
+
 // Enables the backend service for web resources, used in the new tab page for
 // loading tips and recommendations from a JSON feed.
 const char kDisableWebResources[]           = "disable-web-resources";
@@ -297,9 +301,6 @@ const char kEnableSyncPreferences[]         = "enable-sync-preferences";
 // Enable syncing browser typed urls.
 const char kEnableSyncTypedUrls[]           = "enable-sync-typed-urls";
 
-// Enable the tabbed bookmark manager
-const char kEnableTabbedBookmarkManager[]   = "enable-tabbed-bookmark-manager";
-
 // Whether the multiple profiles feature based on the user-data-dir flag is
 // enabled or not.
 const char kEnableUserDataDirProfiles[]     = "enable-udd-profiles";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 8c0d490..9f70988 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -66,6 +66,7 @@ extern const char kDisableSyncAutofill[];
 extern const char kDisableSyncBookmarks[];
 extern const char kDisableSyncPreferences[];
 extern const char kDisableSyncTypedUrls[];
+extern const char kDisableTabbedBookmarkManager[];
 extern const char kDisableWebResources[];
 extern const char kDisableWebSecurity[];
 extern const char kDisableWebSockets[];
@@ -101,7 +102,6 @@ extern const char kEnableSyncAutofill[];
 extern const char kEnableSyncBookmarks[];
 extern const char kEnableSyncPreferences[];
 extern const char kEnableSyncTypedUrls[];
-extern const char kEnableTabbedBookmarkManager[];
 extern const char kEnableUserDataDirProfiles[];
 extern const char kEnableUserStyleSheet[];
 extern const char kEnableVerticalTabs[];