Revert of Unpack theme data from extensions off of UI thread.

chrome/browser/themes/theme_service_browsertest.cc

 // Copyright (c) 2013 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 "chrome/browser/themes/theme_service.h"
 
 #include "base/macros.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
-#include "content/public/test/test_utils.h"
 
 namespace {
 
 // The toolbar color specified in the theme.
 const SkColor kThemeToolbarColor = 0xFFCFDDC0;
 
 bool UsingCustomTheme(const ThemeService& theme_service) {
   return !theme_service.UsingSystemTheme() &&
          !theme_service.UsingDefaultTheme();
 }
@@ skipping 24 matching lines @@
       ThemeService::GetThemeProviderForProfile(profile);
 
   // Test initial state.
   EXPECT_FALSE(UsingCustomTheme(*theme_service));
   EXPECT_NE(kThemeToolbarColor,
             theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));
   EXPECT_EQ(base::FilePath(),
             profile->GetPrefs()->GetFilePath(prefs::kCurrentThemePackFilename));
 
   InstallExtension(test_data_dir_.AppendASCII("theme"), 1);
-  // The theme isn't installed synchronously.
-  EXPECT_FALSE(UsingCustomTheme(*theme_service));
-
-  // Wait for the theme to be loaded.
-  content::WindowedNotificationObserver theme_change_observer(
-      chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
-      content::Source<ThemeService>(theme_service));
-  theme_change_observer.Wait();
 
   // Check that the theme was installed.
   EXPECT_TRUE(UsingCustomTheme(*theme_service));
   EXPECT_EQ(kThemeToolbarColor,
             theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));
   EXPECT_NE(base::FilePath(),
             profile->GetPrefs()->GetFilePath(prefs::kCurrentThemePackFilename));
   // Add a vestigial .pak file that should be removed when the new one is
   // created.
   // TODO(estade): remove when vestigial .pak file deletion is removed.
@@ skipping 28 matching lines @@
           ->profile()
           ->GetPrefs()
           ->GetFilePath(prefs::kCurrentThemePackFilename)
           .AppendASCII("Cached Theme Material Design.pak");
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   EXPECT_FALSE(base::PathExists(old_path)) << "File not deleted: "
                                            << old_path.value();
 }
 
 }  // namespace