diff options
| author | jitendra.ks <jitendra.ks@samsung.com> | 2015-01-28 01:47:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-28 09:48:04 +0000 |
| commit | 30f03390995328247e3642aa5cd2cc9aae781b45 (patch) | |
| tree | ea168f4f4e06752a55912a4d332350be8365b446 /chrome/browser/extensions/api/top_sites | |
| parent | e03f042d1c76262248e42334b1d0326b0e4319e7 (diff) | |
| download | chromium_src-30f03390995328247e3642aa5cd2cc9aae781b45.zip chromium_src-30f03390995328247e3642aa5cd2cc9aae781b45.tar.gz chromium_src-30f03390995328247e3642aa5cd2cc9aae781b45.tar.bz2 | |
Topsites become keyedService based.
TopSites was created and owned by profile.
This patch creates a TopSitesServicefactory which is keyedService.
So now instead of calling GetTopSites() from profile, can get the TopSites from
TopSitesFactory.
BUG=435501
Review URL: https://codereview.chromium.org/815983002
Cr-Commit-Position: refs/heads/master@{#313468}
Diffstat (limited to 'chrome/browser/extensions/api/top_sites')
| -rw-r--r-- | chrome/browser/extensions/api/top_sites/top_sites_api.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/top_sites/top_sites_apitest.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/top_sites/top_sites_api.cc b/chrome/browser/extensions/api/top_sites/top_sites_api.cc index 940667a..ead56e62 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_api.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_api.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/values.h" #include "chrome/browser/history/top_sites.h" +#include "chrome/browser/history/top_sites_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" @@ -18,7 +19,8 @@ TopSitesGetFunction::TopSitesGetFunction() TopSitesGetFunction::~TopSitesGetFunction() {} bool TopSitesGetFunction::RunAsync() { - history::TopSites* ts = GetProfile()->GetTopSites(); + scoped_refptr<history::TopSites> ts = + TopSitesFactory::GetForProfile(GetProfile()); if (!ts) return false; diff --git a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc index 0cb6427..d1e36b8 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/extensions/api/top_sites/top_sites_api.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/history/top_sites.h" +#include "chrome/browser/history/top_sites_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" @@ -23,7 +24,8 @@ class TopSitesExtensionTest : public InProcessBrowserTest { } void SetUpOnMainThread() override { - history::TopSites* top_sites = browser()->profile()->GetTopSites(); + scoped_refptr<history::TopSites> top_sites = + TopSitesFactory::GetForProfile(browser()->profile()); // This may return async or sync. If sync, top_sites_inited_ will be true // before we get to the conditional below. Otherwise, we'll run a nested |