Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/aura/window_tree_host_mojo.h

 // Copyright (c) 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.
 
 #ifndef MOJO_AURA_WINDOW_TREE_HOST_MOJO_H_
 #define MOJO_AURA_WINDOW_TREE_HOST_MOJO_H_
 
 #include "base/bind.h"
-#include "mojo/public/cpp/bindings/error_handler.h"
-#include "mojo/public/cpp/bindings/remote_ptr.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event_source.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 class ContextFactory;
 }
 
 namespace mojo {
 
 class ContextFactoryMojo;
 
 class WindowTreeHostMojo : public aura::WindowTreeHost,
                            public ui::EventSource,
                            public NativeViewportClient {
  public:
-  WindowTreeHostMojo(ScopedNativeViewportHandle viewport_handle,
+  WindowTreeHostMojo(NativeViewportPtr viewport,
                      const gfx::Rect& bounds,
                      const base::Callback<void()>& compositor_created_callback);
   virtual ~WindowTreeHostMojo();
 
   gfx::Rect bounds() const { return bounds_; }
 
  private:
   // WindowTreeHost:
   virtual ui::EventSource* GetEventSource() OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
@@ skipping 15 matching lines @@
 
   // Overridden from NativeViewportClient:
   virtual void OnCreated() OVERRIDE;
   virtual void OnDestroyed() OVERRIDE;
   virtual void OnBoundsChanged(const Rect& bounds) OVERRIDE;
   virtual void OnEvent(const Event& event,
                        const mojo::Callback<void()>& callback) OVERRIDE;
 
   static ContextFactoryMojo* context_factory_;
 
-  RemotePtr<NativeViewport> native_viewport_;
+  NativeViewportPtr native_viewport_;
   base::Callback<void()> compositor_created_callback_;
 
   gfx::Rect bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMojo);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_AURA_WINDOW_TREE_HOST_MOJO_H_