Remove MostVisitedSites => SupervisedUserService dep.

chrome/browser/android/ntp/most_visited_sites_bridge.h

 // Copyright 2016 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_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_BRIDGE_H_
 
 #include <jni.h>
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "chrome/browser/android/ntp/most_visited_sites.h"
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 
 class Profile;
 
 // Provides the list of most visited sites and their thumbnails to Java.
 class MostVisitedSitesBridge {
  public:
   explicit MostVisitedSitesBridge(Profile* profile);
 
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 
@@ skipping 23 matching lines @@
       jint index,
       jint tile_type);
 
   // Registers JNI methods.
   static bool Register(JNIEnv* env);
 
  private:
   ~MostVisitedSitesBridge();
 
   class Observer;
   std::unique_ptr<Observer> observer_;

[Marc Treib, 2016/05/09 08:22:48]

Hm, can we rename this to something more explicit, or at least add a comment?
When first reading this, I got confused about all the observers around here.

[sfiera, 2016/05/09 09:33:35]

Done.

 
+  class SupervisorBridge : public MostVisitedSitesSupervisor,
+                           public SupervisedUserServiceObserver {
+   public:
+    explicit SupervisorBridge(Profile* profile);
+
+    void SetObserver(Observer* observer) override;
+    bool IsBlocked(const GURL& url) override;
+    std::vector<MostVisitedSitesSupervisor::Whitelist> whitelists() override;
+    bool IsChildProfile() override;
+
+    // SupervisedUserServiceObserver implementation.
+    void OnURLFilterChanged() override;
+
+   private:
+    Profile* const profile_;
+    Observer* observer_;
+    ScopedObserver<SupervisedUserService, SupervisedUserServiceObserver>
+        register_observer_;
+  };
+  SupervisorBridge supervisor_;
+
   MostVisitedSites most_visited_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSitesBridge);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_BRIDGE_H_