Add support for components/ntp_tiles in InstantService

chrome/browser/search/instant_service.cc

 // Copyright 2013 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/search/instant_service.h"
 
 #include <stddef.h>
 
-#include "base/strings/string_util.h"
+#include "base/bind.h"
+#include "base/feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/fallback_icon_service_factory.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/favicon/large_icon_service_factory.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/most_visited_iframe_source.h"
 #include "chrome/browser/search/search.h"
+#include "chrome/browser/search/suggestions/image_decoder_impl.h"
+#include "chrome/browser/search/suggestions/suggestions_service_factory.h"
 #include "chrome/browser/search/thumbnail_source.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/webui/fallback_icon_source.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/large_icon_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/favicon/core/fallback_icon_service.h"
 #include "components/favicon/core/large_icon_service.h"
 #include "components/history/core/browser/top_sites.h"
+#include "components/image_fetcher/image_fetcher_impl.h"
 #include "components/keyed_service/core/service_access_type.h"
+#include "components/ntp_tiles/icon_cacher.h"
 #include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/url_data_source.h"
-#include "content/public/common/url_constants.h"
-#include "extensions/common/constants.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image_skia.h"
-#include "url/url_constants.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/search/local_ntp_source.h"
 #endif
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #endif  // defined(ENABLE_THEMES)
 
+namespace {
+
+const base::Feature kNtpTilesFeature{"NTPTilesInInstantService",
+                                     base::FEATURE_DISABLED_BY_DEFAULT};
+
+}  // namespace
+
 InstantService::InstantService(Profile* profile)
     : profile_(profile),
       template_url_service_(TemplateURLServiceFactory::GetForProfile(profile_)),
       weak_ptr_factory_(this) {
   // The initialization below depends on a typical set of browser threads. Skip
   // it if we are running in a unit test without the full suite.
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI))
     return;
 
   // This depends on the existence of the typical browser threads. Therefore it
@@ skipping 16 matching lines @@
 
   ResetInstantSearchPrerendererIfNecessary();
 
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::NotificationService::AllSources());
 
-  scoped_refptr<history::TopSites> top_sites =
-      TopSitesFactory::GetForProfile(profile_);
-  if (top_sites) {
-    top_sites->AddObserver(this);
-    // Immediately query the TopSites state.
-    TopSitesChanged(top_sites.get(),
-                    history::TopSitesObserver::ChangeReason::MOST_VISITED);
+  if (base::FeatureList::IsEnabled(kNtpTilesFeature)) {
+    most_visited_sites_ = base::MakeUnique<ntp_tiles::MostVisitedSites>(
+        profile_->GetPrefs(), TopSitesFactory::GetForProfile(profile_),
+        suggestions::SuggestionsServiceFactory::GetForProfile(profile_),
+        /*popular_sites=*/nullptr,
+        base::MakeUnique<ntp_tiles::IconCacher>(
+            FaviconServiceFactory::GetForProfile(
+                profile, ServiceAccessType::IMPLICIT_ACCESS),
+            base::MakeUnique<image_fetcher::ImageFetcherImpl>(
+                base::MakeUnique<suggestions::ImageDecoderImpl>(),
+                profile->GetRequestContext())),
+        /*supervisor=*/nullptr);
+    // TODO(treib): Add supervisor.
+  }
+
+  if (most_visited_sites_) {

[sfiera, 2016/11/29 10:24:03]

base::MakeUnique<>() cannot return nullptr, can it? So this can be merged into
the previous block.

[Marc Treib, 2016/11/29 15:20:13]

Done.

+    most_visited_sites_->SetMostVisitedURLsObserver(this, 8);
+  } else {
+    scoped_refptr<history::TopSites> top_sites =

[sfiera, 2016/11/29 10:24:03]

We repeat this call a lot below. Is there a reason we don't want to keep a ref
in this class? The below functions generally look like this:

  if (most_visited_sites_) {
    …
  } else {
    scoped_refptr<history::TopSites> top_sites = …;
    if (top_sites_) {
      …
    }
  }

and they would look better to me like this:

  if (most_visited_sites_) {
    …
  } else if (top_sites_) {
    …
  }

[Marc Treib, 2016/11/29 15:20:13]

I don't see a reason not to keep a ref to the TopSites. So, done.

+        TopSitesFactory::GetForProfile(profile_);
+    if (top_sites) {
+      top_sites->AddObserver(this);
+      // Immediately query the TopSites state.
+      TopSitesChanged(top_sites.get(),
+                      history::TopSitesObserver::ChangeReason::MOST_VISITED);
+    }
   }
 
   if (profile_ && profile_->GetResourceContext()) {
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&InstantIOContext::SetUserDataOnIO,
                    profile->GetResourceContext(), instant_io_context_));
   }
 
   // Set up the data sources that Instant uses on the NTP.
@@ skipping 50 matching lines @@
 
 void InstantService::AddObserver(InstantServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void InstantService::RemoveObserver(InstantServiceObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void InstantService::OnNewTabPageOpened() {
-  scoped_refptr<history::TopSites> top_sites =
-      TopSitesFactory::GetForProfile(profile_);
-  if (top_sites)
-    top_sites->SyncWithHistory();
+  if (most_visited_sites_) {
+    most_visited_sites_->Refresh();
+  } else {
+    scoped_refptr<history::TopSites> top_sites =
+        TopSitesFactory::GetForProfile(profile_);
+    if (top_sites)
+      top_sites->SyncWithHistory();
+  }
 }
 
 void InstantService::DeleteMostVisitedItem(const GURL& url) {
-  scoped_refptr<history::TopSites> top_sites =
-      TopSitesFactory::GetForProfile(profile_);
-  if (top_sites)
-    top_sites->AddBlacklistedURL(url);
+  if (most_visited_sites_) {
+    most_visited_sites_->AddOrRemoveBlacklistedUrl(url, true);
+  } else {
+    scoped_refptr<history::TopSites> top_sites =
+        TopSitesFactory::GetForProfile(profile_);
+    if (top_sites)
+      top_sites->AddBlacklistedURL(url);
+  }
 }
 
 void InstantService::UndoMostVisitedDeletion(const GURL& url) {
-  scoped_refptr<history::TopSites> top_sites =
-      TopSitesFactory::GetForProfile(profile_);
-  if (top_sites)
-    top_sites->RemoveBlacklistedURL(url);
+  if (most_visited_sites_) {
+    most_visited_sites_->AddOrRemoveBlacklistedUrl(url, false);
+  } else {
+    scoped_refptr<history::TopSites> top_sites =
+        TopSitesFactory::GetForProfile(profile_);
+    if (top_sites)
+      top_sites->RemoveBlacklistedURL(url);
+  }
 }
 
 void InstantService::UndoAllMostVisitedDeletions() {
-  scoped_refptr<history::TopSites> top_sites =
-      TopSitesFactory::GetForProfile(profile_);
-  if (top_sites)
-    top_sites->ClearBlacklistedURLs();
+  if (most_visited_sites_) {
+    most_visited_sites_->ClearBlacklistedUrls();
+  } else {
+    scoped_refptr<history::TopSites> top_sites =
+        TopSitesFactory::GetForProfile(profile_);
+    if (top_sites)
+      top_sites->ClearBlacklistedURLs();
+  }
 }
 
 void InstantService::UpdateThemeInfo() {
 #if defined(ENABLE_THEMES)
   // Update theme background info.
   // Initialize |theme_info| if necessary.
   if (!theme_info_) {
     OnThemeChanged();
   } else {
     for (InstantServiceObserver& observer : observers_)
@@ skipping 21 matching lines @@
 void InstantService::Shutdown() {
   process_ids_.clear();
 
   if (instant_io_context_.get()) {
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&InstantIOContext::ClearInstantProcessesOnIO,
                    instant_io_context_));
   }
 
-  scoped_refptr<history::TopSites> top_sites =
-      TopSitesFactory::GetForProfile(profile_);
-  if (top_sites)
-    top_sites->RemoveObserver(this);
+  if (most_visited_sites_) {
+    most_visited_sites_.reset();
+  } else {
+    scoped_refptr<history::TopSites> top_sites =
+        TopSitesFactory::GetForProfile(profile_);
+    if (top_sites)
+      top_sites->RemoveObserver(this);
+  }
 
   instant_io_context_ = NULL;
 }
 
 void InstantService::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_CREATED:
       SendSearchURLsToRenderer(
@@ skipping 31 matching lines @@
     InstantMostVisitedItem item;
     item.url = mv_url.url;
     item.title = mv_url.title;
     item.is_server_side_suggestion = false;
     most_visited_items_.push_back(item);
   }
 
   NotifyAboutMostVisitedItems();
 }
 
+void InstantService::OnMostVisitedURLsAvailable(
+    const ntp_tiles::NTPTilesVector& tiles) {
+  DCHECK(most_visited_sites_);
+  most_visited_items_.clear();
+  for (const ntp_tiles::NTPTile& tile : tiles) {
+    InstantMostVisitedItem item;
+    item.url = tile.url;
+    item.title = tile.title;
+    item.thumbnail = tile.thumbnail_url;
+    item.favicon = tile.favicon_url;
+    item.is_server_side_suggestion =
+        tile.source == ntp_tiles::NTPTileSource::SUGGESTIONS_SERVICE;
+    most_visited_items_.push_back(item);
+  }
+
+  NotifyAboutMostVisitedItems();
+}
+
+void InstantService::OnIconMadeAvailable(const GURL& site_url) {}
+
 void InstantService::NotifyAboutMostVisitedItems() {
   for (InstantServiceObserver& observer : observers_)
     observer.MostVisitedItemsChanged(most_visited_items_);
 }
 
 #if defined(ENABLE_THEMES)
 
 namespace {
 
 const int kSectionBorderAlphaTransparency = 80;
@@ skipping 140 matching lines @@
   }
 
   if (default_search_provider_changed || google_base_url_domain_changed) {
     ResetInstantSearchPrerendererIfNecessary();
     for (InstantServiceObserver& observer : observers_)
       observer.DefaultSearchProviderChanged(google_base_url_domain_changed);
   }
 }
 
 void InstantService::TopSitesLoaded(history::TopSites* top_sites) {
+  DCHECK(!most_visited_sites_);
 }
 
 void InstantService::TopSitesChanged(history::TopSites* top_sites,
                                      ChangeReason change_reason) {
+  DCHECK(!most_visited_sites_);
   // As forced urls already come from tiles, we can safely ignore those updates.
   if (change_reason == history::TopSitesObserver::ChangeReason::FORCED_URL)
     return;
   top_sites->GetMostVisitedURLs(
       base::Bind(&InstantService::OnMostVisitedItemsReceived,
                  weak_ptr_factory_.GetWeakPtr()),
       false);
 }
 
 void InstantService::ResetInstantSearchPrerendererIfNecessary() {
   if (!search::ShouldPrefetchSearchResults())
     return;
 
   GURL url(search::GetSearchResultPrefetchBaseURL(profile_));
   if (!instant_prerenderer_ || instant_prerenderer_->prerender_url() != url) {
     instant_prerenderer_.reset(
         url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : nullptr);
   }
 }