summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 21:43:07 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 21:43:07 +0000
commit5d383ab616e2e5ed67db60052ba95ebfeb2067ca (patch)
treeb6ce29b81a7e5147578fe40457bacd3f99ed9f19 /chrome/test
parentec623dad7b56ca081a8eb5a26dc45d60509f521d (diff)
downloadchromium_src-5d383ab616e2e5ed67db60052ba95ebfeb2067ca.zip
chromium_src-5d383ab616e2e5ed67db60052ba95ebfeb2067ca.tar.gz
chromium_src-5d383ab616e2e5ed67db60052ba95ebfeb2067ca.tar.bz2
Revert "Move NTP CSS resources into the NTP resource cache." because it slowed down NTP on mac.
This reverts commit r32649. Review URL: http://codereview.chromium.org/425004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/testing_profile.cc7
-rw-r--r--chrome/test/testing_profile.h4
2 files changed, 1 insertions, 10 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 39e847a..b718773 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -7,7 +7,6 @@
#include "build/build_config.h"
#include "base/string_util.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/dom_ui/ntp_resource_cache.h"
#include "chrome/browser/history/history_backend.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/common/chrome_constants.h"
@@ -202,12 +201,6 @@ void TestingProfile::InitThemes() {
}
}
-NTPResourceCache* TestingProfile::GetNTPResourceCache() {
- if (!ntp_resource_cache_.get())
- ntp_resource_cache_.reset(new NTPResourceCache(this));
- return ntp_resource_cache_.get();
-}
-
void TestingProfile::BlockUntilHistoryProcessesPendingRequests() {
DCHECK(history_service_.get());
DCHECK(MessageLoop::current());
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 37c35ea..677bb7e 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -182,7 +182,7 @@ class TestingProfile : public Profile {
virtual void MarkAsCleanShutdown() {}
virtual void InitExtensions() {}
virtual void InitWebResources() {}
- virtual NTPResourceCache* GetNTPResourceCache();
+ virtual NTPResourceCache* GetNTPResourceCache() { return NULL; }
virtual DesktopNotificationService* GetDesktopNotificationService() {
return NULL;
}
@@ -220,8 +220,6 @@ class TestingProfile : public Profile {
// The TemplateURLFetcher. Only created if CreateTemplateURLModel is invoked.
scoped_ptr<TemplateURLModel> template_url_model_;
- scoped_ptr<NTPResourceCache> ntp_resource_cache_;
-
// The SessionService. Defaults to NULL, but can be set using the setter.
scoped_refptr<SessionService> session_service_;