[subresource_filter] Implement the "Smart" UI on Android

chrome/browser/subresource_filter/subresource_filter_content_settings_manager_factory.cc

 // Copyright 2017 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/subresource_filter/subresource_filter_content_settings_manager_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/subresource_filter/subresource_filter_content_settings_manager.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "content/public/browser/browser_context.h"
 
 // static
-void SubresourceFilterContentSettingsManagerFactory::EnsureForProfile(
+SubresourceFilterContentSettingsManager*
+SubresourceFilterContentSettingsManagerFactory::EnsureForProfile(

[msramek, 2017/04/13 16:08:27]

IIRC you named EnsureForProfile() because it returned void. Should we name it
GetForProfile() now?

[Charlie Harrison, 2017/04/13 17:54:01]

Done.

     Profile* profile) {
-  GetInstance()->GetServiceForBrowserContext(profile, true /* create */);
+  return static_cast<SubresourceFilterContentSettingsManager*>(
+      GetInstance()->GetServiceForBrowserContext(profile, true /* create */));
 }
 
 // static
 SubresourceFilterContentSettingsManagerFactory*
 SubresourceFilterContentSettingsManagerFactory::GetInstance() {
   return base::Singleton<SubresourceFilterContentSettingsManagerFactory>::get();
 }
 
 SubresourceFilterContentSettingsManagerFactory::
     SubresourceFilterContentSettingsManagerFactory()
     : BrowserContextKeyedServiceFactory(
           "SubresourceFilterContentSettingsManager",
           BrowserContextDependencyManager::GetInstance()) {}
 
 KeyedService*
 SubresourceFilterContentSettingsManagerFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new SubresourceFilterContentSettingsManager(
       static_cast<Profile*>(profile));
 }
+
+content::BrowserContext*
+SubresourceFilterContentSettingsManagerFactory::GetBrowserContextToUse(
+    content::BrowserContext* context) const {
+  return context;
+}