Revert 42061 - Enable tabbed bookmark manager by default due to browser_tests and chrome frame breaking.

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

TBR=arv@chromium.org
Review URL: http://codereview.chromium.org/1146004

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

1 files changed, 52 insertions, 64 deletions

diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index 32b67af..0bf5815 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -82,13 +82,12 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest {
 
   void LoadTestExtension() {
     ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
-    const size_t size_before = GetExtensionsService()->extensions()->size();
     ASSERT_TRUE(LoadExtension(
         test_data_dir_.AppendASCII("common").AppendASCII("background_page")));
-    Extension* extension = GetExtensionsService()->extensions()->back();
+    Extension* extension = GetExtensionsService()->extensions()->at(0);
     ASSERT_TRUE(extension);
     first_extension_id_ = extension->id();
-    CheckExtensionConsistency(size_before);
+    CheckExtensionConsistency(0);
   }
 
   void LoadSecondExtension() {
@@ -106,38 +105,35 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, Basic) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
   AcceptCrashedExtensionInfobar(0);
 
   SCOPED_TRACE("after clicking the infobar");
-  CheckExtensionConsistency(size_before);
+  CheckExtensionConsistency(0);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, CloseAndReload) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
   CancelCrashedExtensionInfobar(0);
   ReloadExtension(first_extension_id_);
 
   SCOPED_TRACE("after reloading");
-  CheckExtensionConsistency(size_before);
+  CheckExtensionConsistency(0);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ReloadIndependently) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
 
   ReloadExtension(first_extension_id_);
 
   SCOPED_TRACE("after reloading");
-  CheckExtensionConsistency(size_before);
+  CheckExtensionConsistency(0);
 
   TabContents* current_tab = browser()->GetSelectedTabContents();
   ASSERT_TRUE(current_tab);
@@ -151,82 +147,77 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ReloadIndependently) {
 // and close the browser, it doesn't crash. The browser is closed implicitly
 // at the end of each browser test.
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ShutdownWhileCrashed) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashFirst) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_EQ(1U, GetExtensionsService()->extensions()->size());
   AcceptCrashedExtensionInfobar(0);
 
   SCOPED_TRACE("after clicking the infobar");
-  CheckExtensionConsistency(size_before);
-  CheckExtensionConsistency(size_before + 1);
+  CheckExtensionConsistency(0);
+  CheckExtensionConsistency(1);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashSecond) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
-  CrashExtension(size_before + 1);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  CrashExtension(1);
+  ASSERT_EQ(1U, GetExtensionsService()->extensions()->size());
   AcceptCrashedExtensionInfobar(0);
 
   SCOPED_TRACE("after clicking the infobar");
-  CheckExtensionConsistency(size_before);
-  CheckExtensionConsistency(size_before + 1);
+  CheckExtensionConsistency(0);
+  CheckExtensionConsistency(1);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsCrashBothAtOnce) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_EQ(1U, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
 
   {
     SCOPED_TRACE("first infobar");
     AcceptCrashedExtensionInfobar(0);
-    CheckExtensionConsistency(size_before);
+    CheckExtensionConsistency(0);
   }
 
   {
     SCOPED_TRACE("second infobar");
     AcceptCrashedExtensionInfobar(0);
-    CheckExtensionConsistency(size_before);
-    CheckExtensionConsistency(size_before + 1);
+    CheckExtensionConsistency(0);
+    CheckExtensionConsistency(1);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
   LoadSecondExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
 
   {
     SCOPED_TRACE("first infobar");
     AcceptCrashedExtensionInfobar(0);
-    CheckExtensionConsistency(size_before);
+    CheckExtensionConsistency(0);
   }
 
   {
     SCOPED_TRACE("second infobar");
     AcceptCrashedExtensionInfobar(0);
-    CheckExtensionConsistency(size_before);
-    CheckExtensionConsistency(size_before + 1);
+    CheckExtensionConsistency(0);
+    CheckExtensionConsistency(1);
   }
 }
 
@@ -235,42 +226,39 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) {
 // at the end of each browser test.
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsShutdownWhileCrashed) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
   LoadSecondExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsIgnoreFirst) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_EQ(1U, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
 
   CancelCrashedExtensionInfobar(0);
   AcceptCrashedExtensionInfobar(1);
 
   SCOPED_TRACE("infobars done");
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
-  CheckExtensionConsistency(size_before);
+  ASSERT_EQ(1U, GetExtensionsService()->extensions()->size());
+  CheckExtensionConsistency(0);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsReloadIndependently) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_EQ(1U, GetExtensionsService()->extensions()->size());
+  CrashExtension(0);
+  ASSERT_TRUE(GetExtensionsService()->extensions()->empty());
 
   {
     SCOPED_TRACE("first: reload");
@@ -281,13 +269,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
     ReloadExtension(first_extension_id_);
     // One of the infobars should hide after the extension is reloaded.
     ASSERT_EQ(1, current_tab->infobar_delegate_count());
-    CheckExtensionConsistency(size_before);
+    CheckExtensionConsistency(0);
   }
 
   {
     SCOPED_TRACE("second: infobar");
     AcceptCrashedExtensionInfobar(0);
-    CheckExtensionConsistency(size_before);
-    CheckExtensionConsistency(size_before + 1);
+    CheckExtensionConsistency(0);
+    CheckExtensionConsistency(1);
   }
 }