ntp_snippets: default to staging API on dev/canary

ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc

Index: ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
diff --git a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
index 1b1765a480fcd2d48fb5b3afe34eb062dcff326c..ee2039caeb82092b804451b9092141d6532b55b3 100644
--- a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
+++ b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
@@ -53,6 +53,7 @@ using image_fetcher::ImageFetcherImpl;
 using ios::BookmarkModelFactory;
 using ntp_snippets::BookmarkSuggestionsProvider;
 using ntp_snippets::ContentSuggestionsService;
+using ntp_snippets::GetFetchEndpoint;
 using ntp_snippets::PersistentScheduler;
 using ntp_snippets::RemoteSuggestionsDatabase;
 using ntp_snippets::RemoteSuggestionsFetcher;
@@ -157,9 +158,11 @@ IOSChromeContentSuggestionsServiceFactory::BuildServiceInstanceFor(
 
     auto suggestions_fetcher = base::MakeUnique<RemoteSuggestionsFetcher>(
         signin_manager, token_service, request_context, prefs, nullptr,
-        base::Bind(&ParseJson), GetChannel() == version_info::Channel::STABLE
-                                    ? google_apis::GetAPIKey()
-                                    : google_apis::GetNonStableAPIKey(),
+        base::Bind(&ParseJson),
+        GetFetchEndpoint(GetChannel() >= version_info::Channel::BETA),

[Marc Treib, 2017/02/23 13:57:14]

Hm, can we just pass the channel into GetFetchEndpoint, so that we don't have to
duplicate this logic?

[sfiera, 2017/02/23 14:48:10]

Well, if we add a dep on components/version_info.

+        GetChannel() == version_info::Channel::STABLE
+            ? google_apis::GetAPIKey()
+            : google_apis::GetNonStableAPIKey(),
         service->user_classifier());
 
     auto provider = base::MakeUnique<RemoteSuggestionsProviderImpl>(