Update MostVisitedSites observer interface.

chrome/browser/android/ntp/popular_sites.cc

 // 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.
 
 #include "chrome/browser/android/ntp/popular_sites.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 146 matching lines @@
     sites->push_back(PopularSites::Site(title, GURL(url), GURL(favicon_url),
                                         GURL(large_icon_url),
                                         GURL(thumbnail_url)));
   }
 
   return sites;
 }
 
 }  // namespace
 
-PopularSites::Site::Site(const base::string16& title,
-                         const GURL& url,
-                         const GURL& favicon_url,
-                         const GURL& large_icon_url,
-                         const GURL& thumbnail_url)
+PopularSites_Site::PopularSites_Site(const base::string16& title,
+                                     const GURL& url,
+                                     const GURL& favicon_url,
+                                     const GURL& large_icon_url,
+                                     const GURL& thumbnail_url)
     : title(title),
       url(url),
       favicon_url(favicon_url),
       large_icon_url(large_icon_url),
       thumbnail_url(thumbnail_url) {}
 
-PopularSites::Site::Site(const Site& other) = default;
+PopularSites_Site::PopularSites_Site(const PopularSites_Site& other)
+  = default;
 
-PopularSites::Site::~Site() {}
+PopularSites_Site::~PopularSites_Site() {}
 
 PopularSites::PopularSites(Profile* profile,
                            const std::string& override_country,
                            const std::string& override_version,
                            bool force_download,
                            const FinishedCallback& callback)
     : PopularSites(profile,
                    GetCountryToUse(profile, override_country),
                    GetVersionToUse(override_version),
                    GURL(),
@@ skipping 112 matching lines @@
       base::Bind(&PopularSites::OnJsonParsed, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PopularSites::OnJsonParsed(std::unique_ptr<std::vector<Site>> sites) {
   if (sites)
     sites_.swap(*sites);
   else
     sites_.clear();
   callback_.Run(!!sites);
 }