[Offline pages] Use the new policy bits

components/ntp_snippets/offline_pages/offline_page_suggestions_provider.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 "components/ntp_snippets/offline_pages/offline_page_suggestions_provider.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/ntp_snippets/pref_names.h"
 #include "components/ntp_snippets/pref_util.h"
 #include "components/offline_pages/client_namespace_constants.h"
+#include "components/offline_pages/client_policy_controller.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
 using offline_pages::MultipleOfflinePageItemResult;
 using offline_pages::OfflinePageModel;
 using offline_pages::OfflinePageItem;
 
 namespace ntp_snippets {
 
 namespace {
 
 const int kMaxSuggestionsCount = 5;
 
 struct OrderByMostRecentlyVisited {
   bool operator()(const OfflinePageItem* left,
                   const OfflinePageItem* right) const {
     return left->last_access_time > right->last_access_time;
   }
 };
 
-bool IsRecentTab(const offline_pages::ClientId& client_id) {
+}  // namespace
+
+bool OfflinePageSuggestionsProvider::IsRecentTab(
+    const offline_pages::ClientId& client_id) {
   return client_id.name_space == offline_pages::kLastNNamespace;
 }
 
-bool IsDownload(const offline_pages::ClientId& client_id) {
-  // TODO(pke): Use kDownloadNamespace once the OfflinePageModel uses that.
-  // The current logic is taken from DownloadUIAdapter::IsVisibleInUI.
-  return client_id.name_space == offline_pages::kAsyncNamespace &&
+bool OfflinePageSuggestionsProvider::IsDownload(
+    const offline_pages::ClientId& client_id) {
+  return offline_page_model_->GetPolicyController()->IsSupportedByDownload(

[romax, 2016/10/04 17:50:34]

sorry i remembered we had a discussion on this but i forgot now... what was the
reason we didn't want to have a static IsXXX(ClientId& client_id) method here?

[chili, 2016/10/04 18:08:53]

If it's static, we'd either
--- Get the OfflinePageModel from keyed service to get the
ClientPolicyController (which means we'd have to find the BrowserContext and
depend on content/, which means stuff we'd have to change if we provide iOS
support) 
--- Create a new ClientPolicyController (which means we aren't using the one on
OfflinePageModel, which means if there are policy changes being applied, we
won't be getting the latest version, and these kind of issues are hard to catch)

+             client_id.name_space) &&
          base::IsValidGUID(client_id.id);
 }
 
-}  // namespace
-
 OfflinePageSuggestionsProvider::OfflinePageSuggestionsProvider(
     bool recent_tabs_enabled,
     bool downloads_enabled,
     bool download_manager_ui_enabled,
     ContentSuggestionsProvider::Observer* observer,
     CategoryFactory* category_factory,
     OfflinePageModel* offline_page_model,
     PrefService* pref_service)
     : ContentSuggestionsProvider(observer, category_factory),
       recent_tabs_status_(recent_tabs_enabled
@@ skipping 311 matching lines @@
 }
 
 void OfflinePageSuggestionsProvider::StoreDismissedIDsToPrefs(
     Category category,
     const std::set<std::string>& dismissed_ids) {
   prefs::StoreDismissedIDsToPrefs(pref_service_, GetDismissedPref(category),
                                   dismissed_ids);
 }
 
 }  // namespace ntp_snippets