Pull g_browser_process out of PopularSites.

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 15 matching lines @@
 #include "url/gurl.h"
 
 namespace suggestions {
 class SuggestionsService;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
-class PopularSites;
-class Profile;

[Marc Treib, 2016/04/29 14:46:34]

Profile one is actually still required for now.

[sfiera, 2016/04/29 14:50:54]

Oh yeah, I guess we must be picking it up from SUS.

In any case, CL is already out to you that will actually get rid of Profile from
this file.

+namespace variations {
+class VariationsService;
+}
 
 // Tracks the list of most visited sites and their thumbnails.
 //
 // Do not use, except from MostVisitedSitesBridge. The interface is in flux
 // while we are extracting the functionality of the Java class to make available
 // in C++.
 //
 // TODO(sfiera): finalize interface.
 class MostVisitedSites : public history::TopSitesObserver,
                          public SupervisedUserServiceObserver {
@@ skipping 30 matching lines @@
     Suggestion();
     ~Suggestion();
 
     Suggestion(Suggestion&&);
     Suggestion& operator=(Suggestion&&);
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Suggestion);
   };
 
-  explicit MostVisitedSites(Profile* profile);
+  explicit MostVisitedSites(Profile* profile,
+                            variations::VariationsService* variations_service);

[Bernhard Bauer, 2016/04/29 14:35:45]

Oops, forgot: This doesn't need to be explicit anymore now.

[sfiera, 2016/04/29 14:50:54]

Done.

 
   ~MostVisitedSites() override;
 
   // Does not take ownership of |observer|, which must outlive this object.
   void SetMostVisitedURLsObserver(
       Observer* observer, int num_sites);
 
   using ThumbnailCallback = base::Callback<
       void(bool /* is_local_thumbnail */, const SkBitmap* /* bitmap */)>;
   void GetURLThumbnail(const GURL& url, const ThumbnailCallback& callback);
@@ skipping 106 matching lines @@
   void RecordImpressionUMAMetrics();
 
   // history::TopSitesObserver implementation.
   void TopSitesLoaded(history::TopSites* top_sites) override;
   void TopSitesChanged(history::TopSites* top_sites,
                        ChangeReason change_reason) override;
 
   // The profile whose most visited sites will be queried.
   Profile* profile_;
 
+  variations::VariationsService* variations_service_;
   scoped_refptr<history::TopSites> top_sites_;
   suggestions::SuggestionsService* suggestions_service_;
 
   Observer* observer_;
 
   // The maximum number of most visited sites to return.
   int num_sites_;
 
   // Whether we have received an initial set of most visited sites (from either
   // TopSites or the SuggestionsService).
@@ skipping 19 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_