Snippets are enabled when search suggestions are enabled.

components/ntp_snippets/ntp_snippets_service.cc

Index: components/ntp_snippets/ntp_snippets_service.cc
diff --git a/components/ntp_snippets/ntp_snippets_service.cc b/components/ntp_snippets/ntp_snippets_service.cc
index 4da4e50a3ddeb8950cafb65e3d8ba89a28e7d58b..43e2eecf3ecb511e547d459419d30b5fcb6752af 100644
--- a/components/ntp_snippets/ntp_snippets_service.cc
+++ b/components/ntp_snippets/ntp_snippets_service.cc
@@ -186,6 +186,7 @@ void WrapImageFetchedCallback(
 }  // namespace
 
 NTPSnippetsService::NTPSnippetsService(
+    bool enabled,
     PrefService* pref_service,
     sync_driver::SyncService* sync_service,
     SuggestionsService* suggestions_service,
@@ -194,8 +195,8 @@ NTPSnippetsService::NTPSnippetsService(
     NTPSnippetsScheduler* scheduler,
     std::unique_ptr<NTPSnippetsFetcher> snippets_fetcher,
     std::unique_ptr<ImageFetcher> image_fetcher)
-    : state_(State::NOT_INITED),
-      enabled_(false),
+    : state_(State::INITED),
+      enabled_(enabled),
       pref_service_(pref_service),
       sync_service_(sync_service),
       sync_service_observer_(this),
@@ -211,24 +212,7 @@ NTPSnippetsService::NTPSnippetsService(
   // |sync_service_| can be null in tests or if sync is disabled.
   if (sync_service_)
     sync_service_observer_.Add(sync_service_);
-}
-
-NTPSnippetsService::~NTPSnippetsService() {
-  DCHECK(state_ == State::NOT_INITED || state_ == State::SHUT_DOWN);
-}
-
-// static
-void NTPSnippetsService::RegisterProfilePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterListPref(prefs::kSnippets);
-  registry->RegisterListPref(prefs::kDiscardedSnippets);
-  registry->RegisterListPref(prefs::kSnippetHosts);
-}
 
-void NTPSnippetsService::Init(bool enabled) {
-  DCHECK(state_ == State::NOT_INITED);
-  state_ = State::INITED;
-
-  enabled_ = enabled;
   if (enabled_) {
     // |suggestions_service_| can be null in tests.
     if (snippets_fetcher_->UsesHostRestrictions() && suggestions_service_) {
@@ -249,8 +233,19 @@ void NTPSnippetsService::Init(bool enabled) {
   RescheduleFetching();
 }
 
+NTPSnippetsService::~NTPSnippetsService() {
+  DCHECK_EQ(state_, State::SHUT_DOWN);

[Marc Treib, 2016/05/24 17:20:10]

This won't compile AFAIK, because enum classes don't have operator<< which this
macro requires. :(

+}
+
+// static
+void NTPSnippetsService::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+  registry->RegisterListPref(prefs::kSnippets);
+  registry->RegisterListPref(prefs::kDiscardedSnippets);
+  registry->RegisterListPref(prefs::kSnippetHosts);
+}
+
 void NTPSnippetsService::Shutdown() {
-  DCHECK(state_ == State::INITED);
+  DCHECK_EQ(state_, State::INITED);
   state_ = State::SHUT_DOWN;
 
   FOR_EACH_OBSERVER(NTPSnippetsServiceObserver, observers_,