Remove unused themes on clicking the reset theme button

BUG=164675
TEST=Repro steps at http://crbug.com/164675

Review URL: https://chromiumcodereview.appspot.com/13584007

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

chrome/browser/extensions/extension_install_ui_browsertest.cc

@@ -74,10 +74,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
   ASSERT_EQ(NULL, GetTheme());
 
   // Set the same theme twice and undo to verify we go back to default theme.
-  // 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(InstallExtensionWithUIAutoConfirm(theme_crx, 0, browser()));
+  ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(theme_crx, 1, browser()));
   theme = GetTheme();
   ASSERT_TRUE(theme);
   ASSERT_EQ(theme_id, theme->id());

chrome/browser/themes/theme_service.cc

@@ -304,6 +304,8 @@ void ThemeService::ClearAllThemeData() {
 
   profile_->GetPrefs()->ClearPref(prefs::kCurrentThemePackFilename);
   SaveThemeID(kDefaultThemeID);
+
+  RemoveUnusedThemes();
 }
 
 void ThemeService::LoadThemePrefs() {