Create a ProfileDependencyManager to order ProfileKeyedService destruction.

chrome/browser/ui/gtk/gtk_theme_service.cc

 // Copyright (c) 2011 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/ui/gtk/gtk_theme_service.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
 #include <string>
@@ skipping 309 matching lines @@
 
 bool GtkThemeService::HasCustomImage(int id) const {
   if (use_gtk_)
     return IsOverridableImage(id);
 
   return ThemeService::HasCustomImage(id);
 }
 
 void GtkThemeService::InitThemesFor(NotificationObserver* observer) {
   observer->Observe(NotificationType::BROWSER_THEME_CHANGED,
-                    Source<ui::ThemeProvider>(this),
+                    Source<ThemeService>(this),
                     NotificationService::NoDetails());
 }
 
 void GtkThemeService::SetTheme(const Extension* extension) {
   profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, false);
   LoadDefaultValues();
   ThemeService::SetTheme(extension);
 }
 
 void GtkThemeService::UseDefaultTheme() {
@@ skipping 10 matching lines @@
 }
 
 bool GtkThemeService::UsingDefaultTheme() {
   return !use_gtk_ && ThemeService::UsingDefaultTheme();
 }
 
 void GtkThemeService::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   if ((type == NotificationType::PREF_CHANGED) &&
-      (*Details<std::string>(details).ptr() == prefs::kUsesSystemTheme))
+      (*Details<std::string>(details).ptr() == prefs::kUsesSystemTheme)) {
     use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
+  } else {
+    ThemeService::Observe(type, source, details);
+  }
 }
 
 GtkWidget* GtkThemeService::BuildChromeButton() {
   GtkWidget* button = HoverControllerGtk::CreateChromeButton();
   gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(button), use_gtk_);
   chrome_buttons_.push_back(button);
 
   signals_->Connect(button, "destroy", G_CALLBACK(OnDestroyChromeButtonThunk),
                     this);
   return button;
@@ skipping 756 matching lines @@
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, widget->allocation.y);
   cairo_line_to(cr, start_x,
                 widget->allocation.y + widget->allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }