Drop all uses of //base except ObserverList from view mgr client lib

mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc

 // Copyright 2014 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 "view_manager/public/cpp/lib/view_manager_client_impl.h"
 
-#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
-#include "base/stl_util.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "view_manager/public/cpp/lib/view_private.h"
 #include "view_manager/public/cpp/util.h"
 #include "view_manager/public/cpp/view_manager_delegate.h"
 #include "view_manager/public/cpp/view_observer.h"
 
@@ skipping 63 matching lines @@
   void OnViewDestroyed(View* view) override {
     DCHECK_EQ(view, root_);
     static_cast<ViewManagerClientImpl*>(root_->view_manager())
         ->RootDestroyed(root_);
     view->RemoveObserver(this);
     delete this;
   }
 
   View* root_;
 
-  DISALLOW_COPY_AND_ASSIGN(RootObserver);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(RootObserver);
 };
 
 ViewManagerClientImpl::ViewManagerClientImpl(
     ViewManagerDelegate* delegate,
     Shell* shell,
     InterfaceRequest<ViewManagerClient> request,
     bool delete_on_error)
     : connection_id_(0),
       next_id_(1),
       delegate_(delegate),
@@ skipping 125 matching lines @@
   DCHECK(!service_);
   DCHECK(service);
   service_ = service.Pass();
 }
 ////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, ViewManager implementation:
 
 Id ViewManagerClientImpl::CreateViewOnServer() {
   DCHECK(service_);
   const Id view_id = MakeTransportId(connection_id_, ++next_id_);
-  service_->CreateView(view_id, ActionCompletedCallbackWithErrorCode());
+  service_->CreateView(view_id, [this](ErrorCode code) {
+    OnActionCompleted(code == ERROR_CODE_NONE);
+  });
   return view_id;
 }
 
 const std::string& ViewManagerClientImpl::GetEmbedderURL() const {
   return creator_url_;
 }
 
 View* ViewManagerClientImpl::GetRoot() {
   return root_;
 }
@@ skipping 29 matching lines @@
     service_ = view_manager_service.Pass();
   }
   connection_id_ = connection_id;
   creator_url_ = String::From(creator_url);
 
   DCHECK(!root_);
   root_ = AddViewToViewManager(this, nullptr, root_data);
   root_->AddObserver(new RootObserver(root_));
 
   window_manager_.Bind(window_manager_pipe.Pass());
-  // base::Unretained() is safe here as |window_manager_| is bound to our
-  // lifetime.
   WindowManagerObserverPtr observer;
   wm_observer_binding_.Bind(GetProxy(&observer));
+  // binding to |this| is safe here as |window_manager_| is bound to our
+  // lifetime.
   window_manager_->GetFocusedAndActiveViews(
       observer.Pass(),
-      base::Bind(&ViewManagerClientImpl::OnGotFocusedAndActiveViews,
-                 base::Unretained(this)));
+      [this](uint32_t capture_view_id, uint32_t focused_view_id,
+             uint32_t active_view_id) {
+        if (GetViewById(capture_view_id) != capture_view_)
+          OnCaptureChanged(capture_view_id);
+        if (GetViewById(focused_view_id) != focused_view_)
+          OnFocusChanged(focused_view_id);
+        if (GetViewById(active_view_id) != activated_view_)
+          OnActiveWindowChanged(active_view_id);
+      });
 
   delegate_->OnEmbed(root_, services.Pass(), exposed_services.Pass());
 }
 
 void ViewManagerClientImpl::OnEmbeddedAppDisconnected(Id view_id) {
   View* view = GetViewById(view_id);
   if (view) {
     FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view).observers(),
                       OnViewEmbeddedAppDisconnected(view));
   }
@@ skipping 169 matching lines @@
 void ViewManagerClientImpl::RootDestroyed(View* root) {
   DCHECK_EQ(root, root_);
   root_ = nullptr;
 }
 
 void ViewManagerClientImpl::OnActionCompleted(bool success) {
   if (!change_acked_callback_.is_null())
     change_acked_callback_.Run();
 }
 
-void ViewManagerClientImpl::OnActionCompletedWithErrorCode(ErrorCode code) {
-  OnActionCompleted(code == ERROR_CODE_NONE);
-}
-
-base::Callback<void(bool)> ViewManagerClientImpl::ActionCompletedCallback() {
-  return base::Bind(&ViewManagerClientImpl::OnActionCompleted,
-                    base::Unretained(this));
-}
-
-base::Callback<void(ErrorCode)>
-    ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() {
-  return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode,
-                    base::Unretained(this));
-}
-
-void ViewManagerClientImpl::OnGotFocusedAndActiveViews(
-    uint32_t capture_view_id,
-    uint32_t focused_view_id,
-    uint32_t active_view_id) {
-  if (GetViewById(capture_view_id) != capture_view_)
-    OnCaptureChanged(capture_view_id);
-  if (GetViewById(focused_view_id) != focused_view_)
-    OnFocusChanged(focused_view_id);
-  if (GetViewById(active_view_id) != activated_view_)
-    OnActiveWindowChanged(active_view_id);
+Callback<void(bool)> ViewManagerClientImpl::ActionCompletedCallback() {
+  return [this](bool success) { OnActionCompleted(success); };
 }
 
 }  // namespace mojo