Remove PopularSites' dependencies on //chrome/....

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 76 matching lines @@
     Suggestion& operator=(Suggestion&&);
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Suggestion);
   };
 
   MostVisitedSites(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,
                    bool is_child_profile,
                    Profile* profile);
 
   ~MostVisitedSites() override;
 
   // Does not take ownership of |observer|, which must outlive this object and
   // must not be null.
   void SetMostVisitedURLsObserver(Observer* observer, int num_sites);
@@ skipping 114 matching lines @@
   void TopSitesChanged(history::TopSites* top_sites,
                        ChangeReason change_reason) override;
 
   // The profile whose most visited sites will be queried.
   Profile* profile_;
 
   PrefService* prefs_;
   const TemplateURLService* template_url_service_;
   variations::VariationsService* variations_service_;
   net::URLRequestContextGetter* download_context_;
+  base::FilePath popular_sites_directory_;
   scoped_refptr<history::TopSites> top_sites_;
   suggestions::SuggestionsService* suggestions_service_;
 
   // Children will not be shown popular sites as suggestions.
   // TODO(sfiera): enable/disable suggestions if the profile is marked or
   // unmarked as a child profile during the lifetime of the object. For now, it
   // doesn't matter, because a MostVisitedSites is instantiated for each NTP,
   // but a longer-lived object would need to update.
   bool is_child_profile_;
 
@@ skipping 26 matching lines @@
 
   SuggestionsVector current_suggestions_;
 
   // 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_