Pass PopularSites ownership to MostVisitedSites.

chrome/browser/android/ntp/most_visited_sites_bridge.cc

 // 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.
 
 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/android/ntp/popular_sites.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
@@ skipping 126 matching lines @@
     large_icon_urls.emplace_back(site.large_icon_url.spec());
   }
   Java_MostVisitedURLsObserver_onPopularURLsAvailable(
       env, observer_, ToJavaArrayOfStrings(env, urls),
       ToJavaArrayOfStrings(env, favicon_urls),
       ToJavaArrayOfStrings(env, large_icon_urls));
 }
 
 MostVisitedSitesBridge::MostVisitedSitesBridge(Profile* profile)
     : supervisor_(profile),
-      popular_sites_(BrowserThread::GetBlockingPool(),
-                     profile->GetPrefs(),
-                     TemplateURLServiceFactory::GetForProfile(profile),
-                     g_browser_process->variations_service(),
-                     profile->GetRequestContext(),
-                     ChromePopularSites::GetDirectory(),
-                     base::Bind(safe_json::SafeJsonParser::Parse)),
       most_visited_(profile->GetPrefs(),
                     TopSitesFactory::GetForProfile(profile),
                     SuggestionsServiceFactory::GetForProfile(profile),
-                    &popular_sites_,
+                    base::MakeUnique<ntp_tiles::PopularSites>(
+                        BrowserThread::GetBlockingPool(),
+                        profile->GetPrefs(),
+                        TemplateURLServiceFactory::GetForProfile(profile),
+                        g_browser_process->variations_service(),
+                        profile->GetRequestContext(),
+                        ChromePopularSites::GetDirectory(),
+                        base::Bind(safe_json::SafeJsonParser::Parse)),
                     &supervisor_) {
   // Register the thumbnails debugging page.
   // TODO(sfiera): find thumbnails a home. They don't belong here.
   content::URLDataSource::Add(profile, new ThumbnailListSource(profile));
 }
 
 MostVisitedSitesBridge::~MostVisitedSitesBridge() {}
 
 void MostVisitedSitesBridge::Destroy(
     JNIEnv* env, const JavaParamRef<jobject>& obj) {
@@ skipping 47 matching lines @@
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& jprofile) {
   MostVisitedSitesBridge* most_visited_sites =
       new MostVisitedSitesBridge(
           ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }