Index: chrome/test/base/testing_profile.h |
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h |
index edb28debda7535d960bc880f40a6c27af1c53f8b..72b8caa92b3c2bc87412bad7100278e465d6be2f 100644 |
--- a/chrome/test/base/testing_profile.h |
+++ b/chrome/test/base/testing_profile.h |
@@ -13,6 +13,7 @@ |
#include "chrome/browser/profiles/profile.h" |
#include "components/domain_reliability/clear_mode.h" |
#include "components/keyed_service/content/browser_context_keyed_service_factory.h" |
+#include "components/keyed_service/core/refcounted_keyed_service.h" |
namespace content { |
class MockResourceContext; |
@@ -178,18 +179,6 @@ class TestingProfile : public Profile { |
// Shuts down and nulls out the reference to HistoryService. |
void DestroyHistoryService(); |
- // Creates TopSites. This returns immediately, and top sites may not be |
- // loaded. Use BlockUntilTopSitesLoaded to ensure TopSites has finished |
- // loading. |
- void CreateTopSites(); |
- |
- // Allows to set a test implementation |top_sites|. Testing profile owns |
- // the reference and is responsible for releasing memory. |
- void SetTopSites(history::TopSites* top_sites); |
- |
- // Shuts down and nulls out the reference to TopSites. |
- void DestroyTopSites(); |
- |
// Creates the BookmarkBarModel. If not invoked the bookmark bar model is |
// NULL. If |delete_file| is true, the bookmarks file is deleted first, then |
// the model is created. As TestingProfile deletes the directory containing |
@@ -200,6 +189,8 @@ class TestingProfile : public Profile { |
// WaitForBookmarkModelToLoad(). |
void CreateBookmarkModel(bool delete_file); |
+ void CreateTopSitesService(); |
sdefresne
2015/01/08 10:41:02
nit: leave this method named CreateTopSites() and
Jitu( very slow this week)
2015/01/12 11:30:09
Done.
|
+ |
// Creates a WebDataService. If not invoked, the web data service is NULL. |
void CreateWebDataService(); |
@@ -281,9 +272,6 @@ class TestingProfile : public Profile { |
PrefService* GetPrefs() override; |
- history::TopSites* GetTopSites() override; |
- history::TopSites* GetTopSitesWithoutCreating() override; |
- |
net::URLRequestContextGetter* GetMediaRequestContext() override; |
net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess( |
int renderer_child_id) override; |
@@ -383,7 +371,6 @@ class TestingProfile : public Profile { |
scoped_refptr<HostContentSettingsMap> host_content_settings_map_; |
base::FilePath last_selected_directory_; |
- scoped_refptr<history::TopSites> top_sites_; // For history and thumbnails. |
#if defined(ENABLE_EXTENSIONS) |
scoped_refptr<ExtensionSpecialStoragePolicy> |