Cleanup: de-inline a bunch of classes, rename and move "PluginInstaller" to "...

chrome/browser/extensions/extension_crash_recovery_browsertest.cc

Index: chrome/browser/extensions/extension_crash_recovery_browsertest.cc
===================================================================
--- chrome/browser/extensions/extension_crash_recovery_browsertest.cc	(revision 71863)
+++ chrome/browser/extensions/extension_crash_recovery_browsertest.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -28,25 +28,21 @@
     return browser()->profile()->GetExtensionProcessManager();
   }
 
-  CrashedExtensionInfoBarDelegate* GetCrashedExtensionInfoBarDelegate(
-      int index) {
+  ConfirmInfoBarDelegate* GetInfoBarDelegate(int index) {
     TabContents* current_tab = browser()->GetSelectedTabContents();
     EXPECT_LT(index, current_tab->infobar_delegate_count());
-    InfoBarDelegate* delegate = current_tab->GetInfoBarDelegateAt(index);
-    return delegate->AsCrashedExtensionInfoBarDelegate();
+    return current_tab->GetInfoBarDelegateAt(index)->AsConfirmInfoBarDelegate();
   }
 
-  void AcceptCrashedExtensionInfobar(int index) {
-    CrashedExtensionInfoBarDelegate* infobar =
-        GetCrashedExtensionInfoBarDelegate(index);
+  void AcceptInfoBar(int index) {
+    ConfirmInfoBarDelegate* infobar = GetInfoBarDelegate(index);
     ASSERT_TRUE(infobar);
     infobar->Accept();
     WaitForExtensionLoad();
   }
 
-  void CancelCrashedExtensionInfobar(int index) {
-    CrashedExtensionInfoBarDelegate* infobar =
-        GetCrashedExtensionInfoBarDelegate(index);
+  void CancelInfoBar(int index) {
+    ConfirmInfoBarDelegate* infobar = GetInfoBarDelegate(index);
     ASSERT_TRUE(infobar);
     infobar->Cancel();
   }
@@ -118,7 +114,7 @@
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   ASSERT_EQ(crash_size_before + 1,
             GetExtensionService()->terminated_extensions()->size());
-  AcceptCrashedExtensionInfobar(0);
+  AcceptInfoBar(0);
 
   SCOPED_TRACE("after clicking the infobar");
   CheckExtensionConsistency(size_before);
@@ -137,6 +133,7 @@
             GetExtensionService()->terminated_extensions()->size());
 
   CancelCrashedExtensionInfobar(0);
+  CancelInfoBar(0);
   ReloadExtension(first_extension_id_);
 
   SCOPED_TRACE("after reloading");
@@ -306,7 +303,7 @@
   LoadSecondExtension();
   CrashExtension(size_before);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
-  AcceptCrashedExtensionInfobar(0);
+  AcceptInfoBar(0);
 
   SCOPED_TRACE("after clicking the infobar");
   CheckExtensionConsistency(size_before);
@@ -319,7 +316,7 @@
   LoadSecondExtension();
   CrashExtension(size_before + 1);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
-  AcceptCrashedExtensionInfobar(0);
+  AcceptInfoBar(0);
 
   SCOPED_TRACE("after clicking the infobar");
   CheckExtensionConsistency(size_before);
@@ -344,13 +341,13 @@
 
   {
     SCOPED_TRACE("first infobar");
-    AcceptCrashedExtensionInfobar(0);
+    AcceptInfoBar(0);
     CheckExtensionConsistency(size_before);
   }
 
   {
     SCOPED_TRACE("second infobar");
-    AcceptCrashedExtensionInfobar(0);
+    AcceptInfoBar(0);
     CheckExtensionConsistency(size_before);
     CheckExtensionConsistency(size_before + 1);
   }
@@ -367,13 +364,13 @@
 
   {
     SCOPED_TRACE("first infobar");
-    AcceptCrashedExtensionInfobar(0);
+    AcceptInfoBar(0);
     CheckExtensionConsistency(size_before);
   }
 
   {
     SCOPED_TRACE("second infobar");
-    AcceptCrashedExtensionInfobar(0);
+    AcceptInfoBar(0);
     CheckExtensionConsistency(size_before);
     CheckExtensionConsistency(size_before + 1);
   }
@@ -403,8 +400,8 @@
   CrashExtension(size_before);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
-  CancelCrashedExtensionInfobar(0);
-  AcceptCrashedExtensionInfobar(1);
+  CancelInfoBar(0);
+  AcceptInfoBar(1);
 
   SCOPED_TRACE("infobars done");
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
@@ -435,7 +432,7 @@
 
   {
     SCOPED_TRACE("second: infobar");
-    AcceptCrashedExtensionInfobar(0);
+    AcceptInfoBar(0);
     CheckExtensionConsistency(size_before);
     CheckExtensionConsistency(size_before + 1);
   }