Break dependency of native_viewport_service on mojo::shell::Context

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/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
@@ skipping 15 matching lines @@
          event->type() == ui::ET_MOUSE_DRAGGED ||
          event->type() == ui::ET_TOUCH_MOVED;
 }
 
 }  // namespace
 
 class NativeViewportImpl
     : public InterfaceImpl<mojo::NativeViewport>,
       public NativeViewportDelegate {
  public:
-  NativeViewportImpl(ApplicationConnection* connection,
-                     shell::Context* context)
-      : context_(context),
-        widget_(gfx::kNullAcceleratedWidget),
+  explicit NativeViewportImpl(ApplicationConnection* connection)
+      : widget_(gfx::kNullAcceleratedWidget),
         waiting_for_event_ack_(false),
         weak_factory_(this) {}
   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 Create(RectPtr bounds) OVERRIDE {
-    native_viewport_ =
-        services::NativeViewport::Create(context_, this);
+    native_viewport_ = services::NativeViewport::Create(this);
     native_viewport_->Init(bounds.To<gfx::Rect>());
     client()->OnCreated();
     OnBoundsChanged(bounds.To<gfx::Rect>());
   }
 
   virtual void Show() OVERRIDE {
     native_viewport_->Show();
   }
 
   virtual void Hide() OVERRIDE {
@@ skipping 78 matching lines @@
   virtual void OnDestroyed() OVERRIDE {
     client()->OnDestroyed(base::Bind(&NativeViewportImpl::AckDestroyed,
                                      base::Unretained(this)));
   }
 
  private:
   void AckDestroyed() {
     command_buffer_.reset();
   }
 
-  shell::Context* context_;
   gfx::AcceleratedWidget widget_;
   scoped_ptr<services::NativeViewport> native_viewport_;
   InterfaceRequest<CommandBuffer> command_buffer_request_;
   scoped_ptr<CommandBufferImpl> command_buffer_;
   bool waiting_for_event_ack_;
   base::WeakPtrFactory<NativeViewportImpl> weak_factory_;
 };
 
 class NVSDelegate : public ApplicationDelegate {
  public:
-  NVSDelegate(shell::Context* context) : context_(context) {}
+  NVSDelegate() {}
   virtual ~NVSDelegate() {}
 
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
-    connection->AddService<NativeViewportImpl>(context_);
+    connection->AddService<NativeViewportImpl>();
     return true;
   }
+};
 
- private:
-  mojo::shell::Context* context_;
-};
+MOJO_NATIVE_VIEWPORT_EXPORT mojo::ApplicationImpl*
+    CreateNativeViewportService(
+        ScopedMessagePipeHandle service_provider_handle) {
+  ApplicationImpl* app = new ApplicationImpl(
+      new NVSDelegate(), service_provider_handle.Pass());
+  return app;
+}
 
 }  // namespace services
 }  // namespace mojo
 
-MOJO_NATIVE_VIEWPORT_EXPORT mojo::ApplicationImpl*
-    CreateNativeViewportService(
-        mojo::shell::Context* context,
-        mojo::ScopedMessagePipeHandle service_provider_handle) {
-  mojo::ApplicationImpl* app = new mojo::ApplicationImpl(
-      new mojo::services::NVSDelegate(context), service_provider_handle.Pass());
-  return app;
-}