Clean up how we handle themes in the extensions system and management API....

chrome/browser/extensions/extension_install_ui_browsertest.cc

Index: chrome/browser/extensions/extension_install_ui_browsertest.cc
===================================================================
--- chrome/browser/extensions/extension_install_ui_browsertest.cc	(revision 75613)
+++ chrome/browser/extensions/extension_install_ui_browsertest.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
@@ -15,21 +14,7 @@
 
 }  // namespace
 
-class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {
- public:
-  // Checks that a theme info bar is currently visible and issues an undo to
-  // revert to the previous theme.
-  void VerifyThemeInfoBarAndUndoInstall() {
-    TabContents* tab_contents = browser()->GetSelectedTabContents();
-    ASSERT_TRUE(tab_contents);
-    ASSERT_EQ(1U, tab_contents->infobar_count());
-    ConfirmInfoBarDelegate* delegate =
-        tab_contents->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
-    ASSERT_TRUE(delegate);
-    delegate->Cancel();
-    ASSERT_EQ(0U, tab_contents->infobar_count());
-  }
-};
+class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {};
 
 IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
                        TestThemeInstallUndoResetsToDefault) {
@@ -46,7 +31,7 @@
   // We set the |expected_change| to zero in these 'InstallExtensionWithUI'
   // calls since the theme has already been installed above and this is an
   // overinstall to set the active theme.
-  ASSERT_TRUE(InstallExtensionWithUI(theme_crx, 0));
+  ASSERT_TRUE(InstallExtensionWithUI(theme_crx, 1));
   theme = browser()->profile()->GetTheme();
   ASSERT_TRUE(theme);
   ASSERT_EQ(theme_id, theme->id());
@@ -69,7 +54,7 @@
 
   // Then install second theme.
   FilePath theme_path2 = test_data_dir_.AppendASCII("theme2");
-  ASSERT_TRUE(InstallExtensionWithUI(theme_path2, 1));
+  ASSERT_TRUE(InstallExtensionWithUI(theme_path2, 0));
   const Extension* theme2 = browser()->profile()->GetTheme();
   ASSERT_TRUE(theme2);
   EXPECT_FALSE(theme_id == theme2->id());