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

chrome/browser/themes/theme_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "base/task/cancelable_task_tracker.h"
 #include "build/build_config.h"
 #include "chrome/common/features.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "extensions/common/extension_id.h"
 #include "extensions/features/features.h"
 #include "ui/base/theme_provider.h"
 
-class BrowserThemePack;
 class CustomThemeSupplier;
 class ThemeSyncableService;
 class Profile;
 
 namespace base {
 class FilePath;
 }
 
 namespace color_utils {
 struct HSL;
@@ skipping 38 matching lines @@
   // Overridden from content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Set the current theme to the theme defined in |extension|.
   // |extension| must already be added to this profile's
   // ExtensionService.
   virtual void SetTheme(const extensions::Extension* extension);
 
-  // Similar to SetTheme, but doesn't show an undo infobar.
-  void RevertToTheme(const extensions::Extension* extension);
-
   // Reset the theme to default.
   virtual void UseDefaultTheme();
 
   // Set the current theme to the system theme. On some platforms, the system
   // theme is the default theme.
   virtual void UseSystemTheme();
 
   // Returns true if the default theme and system theme are not the same on
   // this platform.
   virtual bool IsSystemThemeDistinctFromDefaultTheme() const;
@@ skipping 128 matching lines @@
   // Computes the "toolbar top separator" color.  This color is drawn atop the
   // frame to separate it from tabs, the toolbar, and the new tab button, as
   // well as atop background tabs to separate them from other tabs or the
   // toolbar.  We use semitransparent black or white so as to darken or lighten
   // the frame, with the goal of contrasting with both the frame color and the
   // active tab (i.e. toolbar) color.  (It's too difficult to try to find colors
   // that will contrast with both of these as well as the background tab color,
   // and contrasting with the foreground tab is the most important).
   static SkColor GetSeparatorColor(SkColor tab_color, SkColor frame_color);
 
-  void DoSetTheme(const extensions::Extension* extension,
-                  bool suppress_infobar);
-
   // These methods provide the implementation for ui::ThemeProvider (exposed
   // via BrowserThemeProvider).
   gfx::ImageSkia* GetImageSkiaNamed(int id, bool incognito) const;
   SkColor GetColor(int id, bool incognito) const;
   int GetDisplayProperty(int id) const;
   base::RefCountedMemory* GetRawData(int id,
                                      ui::ScaleFactor scale_factor) const;
 #if defined(OS_MACOSX)
   NSImage* GetNSImageNamed(int id, bool incognito) const;
   NSColor* GetNSImageColorNamed(int id, bool incognito) const;
@@ skipping 20 matching lines @@
   // StopUsingTheme() or StartUsingTheme() as appropriate.
   void SwapThemeSupplier(scoped_refptr<CustomThemeSupplier> theme_supplier);
 
   // Saves the filename of the cached theme pack.
   void SavePackName(const base::FilePath& pack_path);
 
   // Save the id of the last theme installed.
   void SaveThemeID(const std::string& id);
 
   // Implementation of SetTheme() (and the fallback from LoadThemePrefs() in
-  // case we don't have a theme pack). |new_theme| indicates whether this is a
-  // newly installed theme or a migration.
-  void BuildFromExtension(const extensions::Extension* extension,
-                          bool new_theme);
-
-  // Callback when |pack| has finished or failed building.
-  void OnThemeBuiltFromExtension(const extensions::ExtensionId& extension_id,
-                                 scoped_refptr<BrowserThemePack> pack,
-                                 bool new_theme);
+  // case we don't have a theme pack).
+  void BuildFromExtension(const extensions::Extension* extension);
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // Returns true if the profile belongs to a supervised user.
   bool IsSupervisedUser() const;
 
   // Sets the current theme to the supervised user theme. Should only be used
   // for supervised user profiles.
   void SetSupervisedUserTheme();
 #endif
 
@@ skipping 36 matching lines @@
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   class ThemeObserver;
   std::unique_ptr<ThemeObserver> theme_observer_;
 #endif
 
   BrowserThemeProvider original_theme_provider_;
   BrowserThemeProvider incognito_theme_provider_;
 
   SEQUENCE_CHECKER(sequence_checker_);
 
-  // Allows us to cancel building a theme pack from an extension.
-  base::CancelableTaskTracker build_extension_task_tracker_;
-
-  // The ID of the theme that's currently being built on a different thread.
-  // We hold onto this just to be sure not to uninstall the extension view
-  // RemoveUnusedThemes while it's still being built.
-  std::string building_extension_id_;
-
   base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_