Add ContentSuggestionsService

chrome/browser/ntp_snippets/content_suggestions_service_factory.cc

Index: chrome/browser/ntp_snippets/content_suggestions_service_factory.cc
diff --git a/chrome/browser/ntp_snippets/content_suggestions_service_factory.cc b/chrome/browser/ntp_snippets/content_suggestions_service_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fb9b9f5f9f58a88538147ee909069ac71794bcd2
--- /dev/null
+++ b/chrome/browser/ntp_snippets/content_suggestions_service_factory.cc
@@ -0,0 +1,57 @@
+// 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/memory/singleton.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/pref_names.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/ntp_snippets/content_suggestions_service.h"
+#include "components/prefs/pref_service.h"
+#include "content/public/browser/browser_context.h"
+
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/chrome_feature_list.h"
+#endif  // OS_ANDROID
+
+// static
+ContentSuggestionsServiceFactory*
+ContentSuggestionsServiceFactory::GetInstance() {
+  return base::Singleton<ContentSuggestionsServiceFactory>::get();
+}
+
+// static
+ntp_snippets::ContentSuggestionsService*
+ContentSuggestionsServiceFactory::GetForProfile(Profile* profile) {
+  DCHECK(!profile->IsOffTheRecord());
+  return static_cast<ntp_snippets::ContentSuggestionsService*>(
+      GetInstance()->GetServiceForBrowserContext(profile, true));
+}
+
+ContentSuggestionsServiceFactory::ContentSuggestionsServiceFactory()
+    : BrowserContextKeyedServiceFactory(
+          "ContentSuggestionsService",
+          BrowserContextDependencyManager::GetInstance()) {}
+
+ContentSuggestionsServiceFactory::~ContentSuggestionsServiceFactory() {}
+
+KeyedService* ContentSuggestionsServiceFactory::BuildServiceInstanceFor(
+    content::BrowserContext* context) const {
+  using State = ntp_snippets::ContentSuggestionsService::State;
+
+  // TODO(mvanouwerkerk): Move the enable logic into the service once we start
+  // observing pref changes.
+  State enabled = State::ENABLED;

[Bernhard Bauer, 2016/07/07 10:02:19]

Wait, on non-Android platforms this is always enabled?

[Philipp Keck, 2016/07/07 12:22:29]

Should be the same as NTPSnippetsServiceFactory.
On non-Android platforms, the ProfileManager will never call the factory, though
(and also nobody else). Still I agree that only enabling on Android seems safer.

[Marc Treib, 2016/07/07 12:32:16]

Yup, IMO we should change this. The change for NTPSnippetsServiceFactory should
be in a separate CL though.

[Philipp Keck, 2016/07/07 12:44:06]

Done. Should I prepare a separate CL for NTPSnippetsServiceFactory?

[Marc Treib, 2016/07/07 12:48:18]

Yup, please do :)

[Philipp Keck, 2016/07/08 09:28:57]

@bauerb Please take a look again at the factory, as the CL needs your approval
for these files. Thank you.

+#if defined(OS_ANDROID)
+  // TODO(pke) Split that feature into suggestions overall and article
+  // suggestions in particular.
+  if (!base::FeatureList::IsEnabled(chrome::android::kNTPSnippetsFeature)) {

[Bernhard Bauer, 2016/07/07 10:02:19]

Nit: No braces for single-line bodies.

[Philipp Keck, 2016/07/07 12:22:29]

A very debatable style rule ... makes it harder to extend the body.
The style guide doesn't require it
(https://google.github.io/styleguide/cppguide.html#Conditionals), if that's the
right style guide.

I still changed it for consistency.

+    enabled = State::DISABLED;
+  }
+#endif  // OS_ANDROID
+
+  return new ntp_snippets::ContentSuggestionsService(enabled);
+}