Update MostVisitedSites observer interface.

chrome/browser/android/ntp/popular_sites.h

 // Copyright 2015 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_POPULAR_SITES_H_
 #define CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/net/file_downloader.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 class Profile;
 
+struct PopularSites_Site {
+  PopularSites_Site(const base::string16& title,
+                    const GURL& url,
+                    const GURL& favicon_url,
+                    const GURL& large_icon_url,
+                    const GURL& thumbnail_url);
+  PopularSites_Site(const PopularSites_Site& other);
+  ~PopularSites_Site();
+
+  base::string16 title;
+  GURL url;
+  GURL favicon_url;
+  GURL large_icon_url;
+  GURL thumbnail_url;
+};
+
 // Downloads and provides a list of suggested popular sites, for display on
 // the NTP when there are not enough personalized suggestions. Caches the
 // downloaded file on disk to avoid re-downloading on every startup.
 class PopularSites {
  public:
-  struct Site {
-    Site(const base::string16& title,
-         const GURL& url,
-         const GURL& favicon_url,
-         const GURL& large_icon_url,
-         const GURL& thumbnail_url);
-    Site(const Site& other);
-    ~Site();
-
-    base::string16 title;
-    GURL url;
-    GURL favicon_url;
-    GURL large_icon_url;
-    GURL thumbnail_url;
-  };
-
+  using Site = PopularSites_Site;
   using FinishedCallback = base::Callback<void(bool /* success */)>;
 
   // Usually, the name of the file that's downloaded is based on the user's
   // locale. |override_country| (if non-empty) is used to override the
   // auto-detected country. |override_version|, if non-empty, will
   // override the baked-in default version.
   // Set |force_download| to enforce re-downloading the suggestions file, even
   // if it already exists on disk.
   PopularSites(Profile* profile,
                const std::string& override_country,
@@ skipping 53 matching lines @@
   base::FilePath local_path_;
 
   Profile* profile_;
 
   base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PopularSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_