Remove NTP dependency on //content/...

chrome/browser/android/ntp/most_visited_sites.h

Index: chrome/browser/android/ntp/most_visited_sites.h
diff --git a/chrome/browser/android/ntp/most_visited_sites.h b/chrome/browser/android/ntp/most_visited_sites.h
index 14b3e636a238272ea55742e40f5addd24c8b8455..b30b9ef550f383ee0a119519e76b7bc9c350cfbd 100644
--- a/chrome/browser/android/ntp/most_visited_sites.h
+++ b/chrome/browser/android/ntp/most_visited_sites.h
@@ -124,7 +124,10 @@ class MostVisitedSites : public history::TopSitesObserver,
     DISALLOW_COPY_AND_ASSIGN(Suggestion);
   };
 
-  MostVisitedSites(PrefService* prefs,
+  MostVisitedSites(const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,

[Bernhard Bauer, 2016/05/24 15:14:47]

If you are going to keep a reference, take the scoped_refptr by value and
std::move it when assigning it to the member.

[sfiera, 2016/05/24 16:59:20]

Done.

+                   const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
+                   const scoped_refptr<base::TaskRunner>& blocking_runner,
+                   PrefService* prefs,
                    const TemplateURLService* template_url_service,
                    variations::VariationsService* variations_service,
                    net::URLRequestContextGetter* download_context,
@@ -271,6 +274,10 @@ class MostVisitedSites : public history::TopSitesObserver,
 
   SuggestionsVector current_suggestions_;
 
+  scoped_refptr<base::SingleThreadTaskRunner> ui_thread_;
+  scoped_refptr<base::SingleThreadTaskRunner> db_thread_;
+  scoped_refptr<base::TaskRunner> blocking_runner_;
+
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<MostVisitedSites> weak_ptr_factory_;