a provider of Physical Web pages.

chrome/browser/ntp_snippets/content_suggestions_service_factory.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
@@ skipping 27 matching lines @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/android/ntp/ntp_snippets_launcher.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provider.h"
+#include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h"
 #include "components/offline_pages/offline_page_model.h"
 
 using ntp_snippets::OfflinePageSuggestionsProvider;
+using ntp_snippets::PhysicalWebPageSuggestionsProvider;
 using offline_pages::OfflinePageModel;
 using offline_pages::OfflinePageModelFactory;
 #endif  // OS_ANDROID
 
 using bookmarks::BookmarkModel;
 using content::BrowserThread;
 using image_fetcher::ImageFetcherImpl;
 using ntp_snippets::BookmarkSuggestionsProvider;
 using ntp_snippets::ContentSuggestionsService;
 using ntp_snippets::NTPSnippetsDatabase;
@@ skipping 79 matching lines @@
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(profile);
     OAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
     scoped_refptr<net::URLRequestContextGetter> request_context =
         content::BrowserContext::GetDefaultStoragePartition(context)
             ->GetURLRequestContext();
     SuggestionsService* suggestions_service =
         SuggestionsServiceFactory::GetForProfile(profile);
     NTPSnippetsScheduler* scheduler = nullptr;
+
+#if defined(OS_ANDROID)

[Marc Treib, 2016/08/10 16:22:03]

This block is in the wrong place: It's inside the kArticleSuggestionsFeature
check.

[tschumann, 2016/08/10 17:37:57]

not really related to this CL, but as we are here...
@Marc: I wonder if we should refactor this method to make it harder getting this
wrong. Something like:
if (base::FeatureList::IsEnabled(ntp_snippets::kBookmarkSuggestionsFeature)) {
  RegisterBookmarksProvider(service);
}
if
(base::FeatureList::IsEnabled(ntp_snippets::ntp_snippets::kArticleSuggestionsFeature)
{
  RegisterArticleProvider(service);
}

etc. With more providers to come, this might get a bit crowded here...

[Marc Treib, 2016/08/11 12:15:24]

Yep, this sounds like a good idea. Doesn't need to happen in this CL though.

[vitaliii, 2016/08/11 12:15:24]

Done.

[vitaliii, 2016/08/11 12:15:24]

Acknowledged.

+  // Create the PhysicalWebPageSuggestionsProvider.
+  if (base::FeatureList::IsEnabled(
+          chrome::android::kNTPPhysicalWebPageSuggestionsFeature)) {
+    std::unique_ptr<PhysicalWebPageSuggestionsProvider>
+        physical_web_page_suggestions_provider =
+            base::MakeUnique<PhysicalWebPageSuggestionsProvider>(
+                service, service->category_factory());
+    service->RegisterProvider(
+        std::move(physical_web_page_suggestions_provider));
+  }
+#endif  // OS_ANDROID
+
 #if defined(OS_ANDROID)
     scheduler = NTPSnippetsLauncher::Get();
 #endif  // OS_ANDROID
     base::FilePath database_dir(
         profile->GetPath().Append(ntp_snippets::kDatabaseFolder));
     scoped_refptr<base::SequencedTaskRunner> task_runner =
         BrowserThread::GetBlockingPool()
             ->GetSequencedTaskRunnerWithShutdownBehavior(
                 base::SequencedWorkerPool::GetSequenceToken(),
                 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
@@ skipping 13 matching lines @@
             base::MakeUnique<ImageDecoderImpl>(),
             base::MakeUnique<NTPSnippetsDatabase>(database_dir, task_runner),
             base::MakeUnique<NTPSnippetsStatusService>(signin_manager,
                                                        profile->GetPrefs()));
     service->set_ntp_snippets_service(ntp_snippets_service.get());
     service->RegisterProvider(std::move(ntp_snippets_service));
   }
 
   return service;
 }