diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 20:22:31 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 20:22:31 +0000 |
| commit | 95003d52ea8b90463d7e1770f560c59f9eb03b97 (patch) | |
| tree | ad4548f50880085d1fee1da57f1def734a4d404e /chrome/browser/feedback | |
| parent | aff066b2a33f5aff17546d99098559c43960a72d (diff) | |
| download | chromium_src-95003d52ea8b90463d7e1770f560c59f9eb03b97.zip chromium_src-95003d52ea8b90463d7e1770f560c59f9eb03b97.tar.gz chromium_src-95003d52ea8b90463d7e1770f560c59f9eb03b97.tar.bz2 | |
Move clients of BrowserContextKeyedService to use KeyedService (#5)
This patch moves the remaining clients of BCKS in //chrome/browser to use
KeyedService.
BUG=351704
TBR=jochen
Review URL: https://codereview.chromium.org/198883002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/feedback')
4 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/feedback/feedback_uploader.h b/chrome/browser/feedback/feedback_uploader.h index aa91613..415b16d 100644 --- a/chrome/browser/feedback/feedback_uploader.h +++ b/chrome/browser/feedback/feedback_uploader.h @@ -14,7 +14,7 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/feedback/feedback_uploader_delegate.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" namespace content { class BrowserContext; @@ -27,7 +27,7 @@ class FeedbackReport; // FeedbackUploader is used to add a feedback report to the queue of reports // being uploaded. In case uploading a report fails, it is written to disk and // tried again when it's turn comes up next in the queue. -class FeedbackUploader : public BrowserContextKeyedService, +class FeedbackUploader : public KeyedService, public base::SupportsWeakPtr<FeedbackUploader> { public: explicit FeedbackUploader(content::BrowserContext* context); diff --git a/chrome/browser/feedback/feedback_uploader_factory.cc b/chrome/browser/feedback/feedback_uploader_factory.cc index 72626a2..4a715ff 100644 --- a/chrome/browser/feedback/feedback_uploader_factory.cc +++ b/chrome/browser/feedback/feedback_uploader_factory.cc @@ -7,7 +7,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/feedback/feedback_uploader.h" #include "chrome/browser/profiles/incognito_helpers.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" namespace feedback { @@ -30,7 +30,7 @@ FeedbackUploaderFactory::FeedbackUploaderFactory() FeedbackUploaderFactory::~FeedbackUploaderFactory() {} -BrowserContextKeyedService* FeedbackUploaderFactory::BuildServiceInstanceFor( +KeyedService* FeedbackUploaderFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { return new FeedbackUploader(context); } diff --git a/chrome/browser/feedback/feedback_uploader_factory.h b/chrome/browser/feedback/feedback_uploader_factory.h index b79cbdb..2823c09 100644 --- a/chrome/browser/feedback/feedback_uploader_factory.h +++ b/chrome/browser/feedback/feedback_uploader_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FEEDBACK_FEEDBACK_UPLOADER_FACTORY_H_ #define CHROME_BROWSER_FEEDBACK_FEEDBACK_UPLOADER_FACTORY_H_ -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" template<typename T> struct DefaultSingletonTraits; @@ -34,7 +34,7 @@ class FeedbackUploaderFactory : public BrowserContextKeyedServiceFactory { virtual ~FeedbackUploaderFactory(); // BrowserContextKeyedServiceFactory overrides: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; diff --git a/chrome/browser/feedback/feedback_uploader_unittest.cc b/chrome/browser/feedback/feedback_uploader_unittest.cc index ab58065..2b07f91 100644 --- a/chrome/browser/feedback/feedback_uploader_unittest.cc +++ b/chrome/browser/feedback/feedback_uploader_unittest.cc @@ -25,8 +25,7 @@ const char kReportFive[] = "five"; const base::TimeDelta kRetryDelayForTest = base::TimeDelta::FromMilliseconds(100); -BrowserContextKeyedService* CreateFeedbackUploaderService( - content::BrowserContext* context) { +KeyedService* CreateFeedbackUploaderService(content::BrowserContext* context) { return new feedback::FeedbackUploader(Profile::FromBrowserContext(context)); } |