Remove NTP dependency on //content/...

chrome/browser/android/ntp/most_visited_sites.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_
 #define CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 106 matching lines @@
     Suggestion();
     ~Suggestion();
 
     Suggestion(Suggestion&&);
     Suggestion& operator=(Suggestion&&);
 
    private:
     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,
                    const base::FilePath& popular_sites_directory,
                    scoped_refptr<history::TopSites> top_sites,
                    suggestions::SuggestionsService* suggestions,
                    MostVisitedSitesSupervisor* supervisor);
 
   ~MostVisitedSites() override;
 
@@ skipping 126 matching lines @@
       suggestions_subscription_;
 
   ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_;
 
   MostVisitedSource mv_source_;
 
   std::unique_ptr<PopularSites> popular_sites_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_