summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 17:36:42 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 17:36:42 +0000
commita0ea76cbf036408912e337653500aaefd51586b9 (patch)
treeed1bf3f0a50025df8c2d4b7e083593ded4d2e01a /chrome/test
parent58492209d54a3af3e40fa0a876c9d6381d943188 (diff)
downloadchromium_src-a0ea76cbf036408912e337653500aaefd51586b9.zip
chromium_src-a0ea76cbf036408912e337653500aaefd51586b9.tar.gz
chromium_src-a0ea76cbf036408912e337653500aaefd51586b9.tar.bz2
Theme system cleanup
- Removes useless dependencies on themeing from content/ - Renames BrowserThemeProvider to ThemeService, along with name variants such as GtkThemeService. BrowserThemeProvider has grown by a lot to be more than an implementation of the ui::ThemeProvider interface. This change touches everything. - Rename theme_service.{h,cc} (which defined ThemeServiceFactory) to theme_service_factory.{h,cc}. BUG=77155 TEST=compiles. Review URL: http://codereview.chromium.org/6727005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/live_sync/live_extensions_sync_test.cc4
-rw-r--r--chrome/test/live_sync/live_themes_sync_test.cc2
-rw-r--r--chrome/test/testing_profile.cc2
-rw-r--r--chrome/test/testing_profile.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/test/live_sync/live_extensions_sync_test.cc b/chrome/test/live_sync/live_extensions_sync_test.cc
index 258b82e..9b2e64a 100644
--- a/chrome/test/live_sync/live_extensions_sync_test.cc
+++ b/chrome/test/live_sync/live_extensions_sync_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -11,7 +11,7 @@
#include "base/ref_counted.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/themes/theme_service.h"
#include "chrome/common/extensions/extension.h"
LiveExtensionsSyncTest::LiveExtensionsSyncTest(TestType test_type)
diff --git a/chrome/test/live_sync/live_themes_sync_test.cc b/chrome/test/live_sync/live_themes_sync_test.cc
index 3c65359..0537565 100644
--- a/chrome/test/live_sync/live_themes_sync_test.cc
+++ b/chrome/test/live_sync/live_themes_sync_test.cc
@@ -9,8 +9,8 @@
#include "base/logging.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/themes/browser_theme_provider.h"
#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
#include "chrome/common/extensions/extension.h"
LiveThemesSyncTest::LiveThemesSyncTest(TestType test_type)
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 26e452c..484d780 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -323,7 +323,7 @@ void TestingProfile::SetTemplateURLModel(TemplateURLModel* model) {
template_url_model_.reset(model);
}
-void TestingProfile::UseThemeProvider(BrowserThemeProvider* theme_provider) {
+void TestingProfile::UseThemeProvider(ThemeService* theme_provider) {
NOTREACHED() << "This needs to go away for a different testing interface.";
}
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index befc5a6..91d63aa 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -22,7 +22,6 @@ class CookieMonster;
class AutocompleteClassifier;
class BookmarkModel;
-class BrowserThemeProvider;
class CommandLine;
class DesktopNotificationService;
class ExtensionPrefs;
@@ -40,6 +39,7 @@ class ProfileSyncService;
class SessionService;
class TemplateURLModel;
class TestingPrefService;
+class ThemeService;
class URLRequestContextGetter;
class WebKitContext;
@@ -115,7 +115,7 @@ class TestingProfile : public Profile {
// Uses a specific theme provider for this profile. TestingProfile takes
// ownership of |theme_provider|.
- void UseThemeProvider(BrowserThemeProvider* theme_provider);
+ void UseThemeProvider(ThemeService* theme_provider);
// Creates an ExtensionService initialized with the testing profile and
// returns it. The profile keeps its own copy of a scoped_refptr to the