[Background Fetch] Register Offline Item Aggregator in incognito mode

Bug: 766082
Change-Id: Idd4a607177f0bbe44fac8dd9e7cd9fe357dbf4ef
Reviewed-on: https://chromium-review.googlesource.com/1170906Reviewed-by: Peter Beverloo <peter@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585219}

chrome/browser/background_fetch/background_fetch_delegate_factory.cc

@@ -4,12 +4,18 @@
 
 #include "chrome/browser/background_fetch/background_fetch_delegate_factory.h"
 
+#include "base/strings/string_number_conversions.h"
 #include "chrome/browser/background_fetch/background_fetch_delegate_impl.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/background_fetch_delegate.h"
 
+namespace {
+constexpr char kBackgroundFetchNamespacePrefix[] = "background_fetch_";
+}  // namespace
+
 // static
 BackgroundFetchDelegateImpl* BackgroundFetchDelegateFactory::GetForProfile(
     Profile* profile) {
@@ -33,5 +39,17 @@ BackgroundFetchDelegateFactory::~BackgroundFetchDelegateFactory() {}
 
 KeyedService* BackgroundFetchDelegateFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return new BackgroundFetchDelegateImpl(Profile::FromBrowserContext(context));
+  // Number of offline content aggregator registrations. There can be multiple
+  // incognito profiles created, and the provided namespace needs to be unique.
+  static int num_registrations = 0;
+
+  std::string provider_namespace =
+      kBackgroundFetchNamespacePrefix + base::IntToString(++num_registrations);
+  return new BackgroundFetchDelegateImpl(Profile::FromBrowserContext(context),
+                                         provider_namespace);
+}
+
+content::BrowserContext* BackgroundFetchDelegateFactory::GetBrowserContextToUse(
+    content::BrowserContext* context) const {
+  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }

chrome/browser/background_fetch/background_fetch_delegate_factory.h

@@ -24,11 +24,10 @@ class BackgroundFetchDelegateFactory
   BackgroundFetchDelegateFactory();
   ~BackgroundFetchDelegateFactory() override;
 
-  // BrowserContextKeyedBaseFactory methods:
-  // TODO(crbug.com/766082): Override GetBrowserContextToUse to handle Incognito
-  // mode.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
+  content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundFetchDelegateFactory);
 };

chrome/browser/background_fetch/background_fetch_delegate_impl.cc

@@ -26,13 +26,15 @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 
-BackgroundFetchDelegateImpl::BackgroundFetchDelegateImpl(Profile* profile)
+BackgroundFetchDelegateImpl::BackgroundFetchDelegateImpl(
+    Profile* profile,
+    const std::string& provider_namespace)
     : profile_(profile),
       offline_content_aggregator_(
           OfflineContentAggregatorFactory::GetForBrowserContext(profile)),
       weak_ptr_factory_(this) {
   DCHECK(profile_);
-  offline_content_aggregator_->RegisterProvider("background_fetch", this);
+  offline_content_aggregator_->RegisterProvider(provider_namespace, this);
 }
 
 BackgroundFetchDelegateImpl::~BackgroundFetchDelegateImpl() = default;

chrome/browser/background_fetch/background_fetch_delegate_impl.h

@@ -39,7 +39,8 @@ class BackgroundFetchDelegateImpl
       public offline_items_collection::OfflineContentProvider,
       public KeyedService {
  public:
-  explicit BackgroundFetchDelegateImpl(Profile* profile);
+  BackgroundFetchDelegateImpl(Profile* profile,
+                              const std::string& provider_namespace);
 
   ~BackgroundFetchDelegateImpl() override;
 

chrome/browser/offline_items_collection/offline_content_aggregator_factory.cc

@@ -20,7 +20,6 @@ OfflineContentAggregatorFactory::GetInstance() {
 offline_items_collection::OfflineContentAggregator*
 OfflineContentAggregatorFactory::GetForBrowserContext(
     content::BrowserContext* context) {
-  DCHECK(!context->IsOffTheRecord());
   return static_cast<offline_items_collection::OfflineContentAggregator*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
@@ -34,6 +33,7 @@ OfflineContentAggregatorFactory::~OfflineContentAggregatorFactory() = default;
 
 KeyedService* OfflineContentAggregatorFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
+  DCHECK(!context->IsOffTheRecord());
   return new offline_items_collection::OfflineContentAggregator();
 }