Revert changes to have ExtensionService notify ThemeService directly

chrome/browser/extensions/extension_install_ui_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "base/string_util.h"
 #include "chrome/app/chrome_command_ids.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/infobars/infobar_tab_helper.h"
@@ skipping 32 matching lines @@
   void InstallThemeAndVerify(const char* theme_name,
                              const std::string& expected_name) {
     const FilePath theme_path = test_data_dir_.AppendASCII(theme_name);
     ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(theme_path, 1, browser()));
     const Extension* theme = GetTheme();
     ASSERT_TRUE(theme);
     ASSERT_EQ(theme->name(), expected_name);
   }
 
   const Extension* GetTheme() const {
-    Profile* profile = browser()->profile();
-    std::string theme_id = ThemeService::GetThemeIDForProfile(profile);
-    return
-        (theme_id == ThemeService::kDefaultThemeID) ?
-        NULL :
-        profile->GetExtensionService()->GetExtensionById(theme_id, false);
+    return ThemeServiceFactory::GetThemeForProfile(browser()->profile());
   }
 };
 
 #if defined(OS_LINUX)
 // Fails consistently on bot chromium.chromiumos \ Linux.
 // See: http://crbug.com/120647.
 #define MAYBE_TestThemeInstallUndoResetsToDefault DISABLED_TestThemeInstallUndoResetsToDefault
 #else
 #define MAYBE_TestThemeInstallUndoResetsToDefault TestThemeInstallUndoResetsToDefault
 #endif
@@ skipping 90 matching lines @@
   if (NewTabUI::ShouldShowApps()) {
     EXPECT_EQ(num_normal_tabs + 1, browser()->tab_count());
     WebContents* web_contents = chrome::GetActiveWebContents(browser());
     ASSERT_TRUE(web_contents);
     EXPECT_TRUE(StartsWithASCII(web_contents->GetURL().spec(),
                                 "chrome://newtab/", false));
   } else {
     // TODO(xiyuan): Figure out how to test extension installed bubble?
   }
 }