| Index: components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h
|
| diff --git a/components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h b/components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h
|
| index 1d19f72dfa7ecf8f3947e1321890f4c8d2265f83..c7b7102a337f38410dd44234fa966da4e187ebf7 100644
|
| --- a/components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h
|
| +++ b/components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h
|
| @@ -9,58 +9,59 @@
|
| #include "base/sequenced_task_runner_helpers.h"
|
| #include "content/public/browser/browser_thread.h"
|
|
|
| -class RefcountedProfileKeyedService;
|
| +class RefcountedBrowserContextKeyedService;
|
|
|
| namespace impl {
|
|
|
| -struct RefcountedProfileKeyedServiceTraits {
|
| - static void Destruct(const RefcountedProfileKeyedService* obj);
|
| +struct RefcountedBrowserContextKeyedServiceTraits {
|
| + static void Destruct(const RefcountedBrowserContextKeyedService* obj);
|
| };
|
|
|
| } // namespace impl
|
|
|
| -// Base class for refcounted objects that hang off the Profile.
|
| +// Base class for refcounted objects that hang off the BrowserContext.
|
| //
|
| -// The two pass shutdown described in ProfileKeyedService works a bit
|
| +// The two pass shutdown described in BrowserContextKeyedService works a bit
|
| // differently because there could be outstanding references on other
|
| // threads. ShutdownOnUIThread() will be called on the UI thread, and then the
|
| // destructor will run when the last reference is dropped, which may or may not
|
| -// be after the corresponding Profile has been destroyed.
|
| +// be after the corresponding BrowserContext has been destroyed.
|
| //
|
| // Optionally, if you initialize your service with the constructor that takes a
|
| // thread ID, your service will be deleted on that thread. We can't use
|
| -// content::DeleteOnThread<> directly because RefcountedProfileKeyedService
|
| -// must be one type that RefcountedProfileKeyedServiceFactory can use.
|
| -class RefcountedProfileKeyedService
|
| +// content::DeleteOnThread<> directly because
|
| +// RefcountedBrowserContextKeyedService must be one type that
|
| +// RefcountedBrowserContextKeyedServiceFactory can use.
|
| +class RefcountedBrowserContextKeyedService
|
| : public base::RefCountedThreadSafe<
|
| - RefcountedProfileKeyedService,
|
| - impl::RefcountedProfileKeyedServiceTraits> {
|
| + RefcountedBrowserContextKeyedService,
|
| + impl::RefcountedBrowserContextKeyedServiceTraits> {
|
| public:
|
| - // Unlike ProfileKeyedService, ShutdownOnUI is not optional. You must do
|
| - // something to drop references during the first pass Shutdown() because this
|
| - // is the only point where you are guaranteed that something is running on
|
| - // the UI thread. The PKSF framework will ensure that this is only called on
|
| - // the UI thread; you do not need to check for that yourself.
|
| + // Unlike BrowserContextKeyedService, ShutdownOnUI is not optional. You must
|
| + // do something to drop references during the first pass Shutdown() because
|
| + // this is the only point where you are guaranteed that something is running
|
| + // on the UI thread. The PKSF framework will ensure that this is only called
|
| + // on the UI thread; you do not need to check for that yourself.
|
| virtual void ShutdownOnUIThread() = 0;
|
|
|
| protected:
|
| // If your service does not need to be deleted on a specific thread, use the
|
| // default constructor.
|
| - RefcountedProfileKeyedService();
|
| + RefcountedBrowserContextKeyedService();
|
|
|
| // If you need your service to be deleted on a specific thread (for example,
|
| // you're converting a service that used content::DeleteOnThread<IO>), then
|
| // use this constructor with the ID of the thread.
|
| - explicit RefcountedProfileKeyedService(
|
| + explicit RefcountedBrowserContextKeyedService(
|
| const content::BrowserThread::ID thread_id);
|
|
|
| // The second pass destruction can happen anywhere unless you specify which
|
| // thread this service must be destroyed on by using the second constructor.
|
| - virtual ~RefcountedProfileKeyedService();
|
| + virtual ~RefcountedBrowserContextKeyedService();
|
|
|
| private:
|
| - friend struct impl::RefcountedProfileKeyedServiceTraits;
|
| - friend class base::DeleteHelper<RefcountedProfileKeyedService>;
|
| + friend struct impl::RefcountedBrowserContextKeyedServiceTraits;
|
| + friend class base::DeleteHelper<RefcountedBrowserContextKeyedService>;
|
|
|
| // Do we have to delete this object on a specific thread?
|
| bool requires_destruction_on_thread_;
|
|
|