Revert 270867 "Mojo: Internalize ServiceConnector<>"

trunk/src/mojo/services/native_viewport/native_viewport_service.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 "mojo/services/native_viewport/native_viewport_service.h"
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
@@ skipping 10 matching lines @@
 
 bool IsRateLimitedEventType(ui::Event* event) {
   return event->type() == ui::ET_MOUSE_MOVED ||
          event->type() == ui::ET_MOUSE_DRAGGED ||
          event->type() == ui::ET_TOUCH_MOVED;
 }
 
 }
 
 class NativeViewportImpl
-    : public InterfaceImpl<mojo::NativeViewport>,
+    : public ServiceConnection<mojo::NativeViewport,
+                               NativeViewportImpl,
+                               shell::Context>,
       public NativeViewportDelegate {
  public:
-  NativeViewportImpl(shell::Context* context)
-      : context_(context),
-        widget_(gfx::kNullAcceleratedWidget),
+  NativeViewportImpl()
+      : widget_(gfx::kNullAcceleratedWidget),
         waiting_for_event_ack_(false) {}
   virtual ~NativeViewportImpl() {
     // Destroy the NativeViewport early on as it may call us back during
     // destruction and we want to be in a known state.
     native_viewport_.reset();
   }
 
-  virtual void OnConnectionError() OVERRIDE {}
-
   virtual void Create(const Rect& bounds) OVERRIDE {
     native_viewport_ =
-        services::NativeViewport::Create(context_, this);
+        services::NativeViewport::Create(context(), this);
     native_viewport_->Init(bounds);
     client()->OnCreated();
     OnBoundsChanged(bounds);
   }
 
   virtual void Show() OVERRIDE {
     native_viewport_->Show();
   }
 
   virtual void Hide() OVERRIDE {
@@ skipping 109 matching lines @@
     client()->OnBoundsChanged(bounds);
   }
 
   virtual void OnDestroyed() OVERRIDE {
     command_buffer_.reset();
     client()->OnDestroyed();
     base::MessageLoop::current()->Quit();
   }
 
  private:
-  shell::Context* context_;
   gfx::AcceleratedWidget widget_;
   scoped_ptr<services::NativeViewport> native_viewport_;
   ScopedMessagePipeHandle command_buffer_handle_;
   scoped_ptr<CommandBufferImpl> command_buffer_;
   bool waiting_for_event_ack_;
 };
 
 }  // namespace services
 }  // namespace mojo
 
 
 MOJO_NATIVE_VIEWPORT_EXPORT mojo::Application*
     CreateNativeViewportService(mojo::shell::Context* context,
                                 mojo::ScopedMessagePipeHandle shell_handle) {
   mojo::Application* app = new mojo::Application(shell_handle.Pass());
-  app->AddService<mojo::services::NativeViewportImpl>(context);
+  app->AddServiceConnector(
+      new mojo::ServiceConnector<mojo::services::NativeViewportImpl,
+                                 mojo::shell::Context>(context));
   return app;
 }