[Chrome Colors] Cleanup during shutdown.

Bug: 1008813
Change-Id: I700da434baeecc626196b7e725adcf1262f558fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1829943Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Gayane Petrosyan <gayane@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703838}

chrome/browser/search/chrome_colors/chrome_colors_service.cc

@@ -114,6 +114,8 @@ void ChromeColorsService::SaveThemeRevertState(content::WebContents* tab) {
   }
 }
 
-void ChromeColorsService::Shutdown() {}
+void ChromeColorsService::Shutdown() {
+  RevertThemeChangesWithReason(RevertReason::SHUTDOWN);
+}
 
 }  // namespace chrome_colors

chrome/browser/search/chrome_colors/chrome_colors_service.h

@@ -25,7 +25,8 @@ enum class RevertReason {
   SEARCH_PROVIDER_CHANGE = 1,
   TAB_CLOSED = 2,
   NAVIGATION = 3,
-  kMaxValue = NAVIGATION,
+  SHUTDOWN = 4,
+  kMaxValue = SHUTDOWN,
 };
 
 // Supports theme changes originating from the NTP customization menu. Users can

chrome/browser/themes/theme_service_factory.cc

@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
@@ -13,6 +14,7 @@
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
+#include "extensions/browser/extension_prefs_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_factory.h"
 
@@ -51,6 +53,8 @@ ThemeServiceFactory::ThemeServiceFactory()
           "ThemeService",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
+  DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
+  DependsOn(extensions::ExtensionSystemFactory::GetInstance());
 }
 
 ThemeServiceFactory::~ThemeServiceFactory() {}

tools/metrics/histograms/enums.xml

@@ -7718,6 +7718,7 @@ histogram as enum -->
   <int value="1" label="Search provider change"/>
   <int value="2" label="Tab closed"/>
   <int value="3" label="Navigation"/>
+  <int value="4" label="Shutdown"/>
 </enum>
 
 <enum name="ChromeDownloadCountType">