Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

components/html_viewer/blink_platform_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 "components/html_viewer/blink_platform_impl.h"
 
 #include <cmath>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "components/html_viewer/web_cookie_jar_impl.h"
 #include "components/html_viewer/web_graphics_context_3d_command_buffer_impl.h"
 #include "components/html_viewer/web_socket_handle_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
 #include "components/message_port/web_message_port_channel_impl.h"
 #include "components/mime_util/mime_util.h"
 #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
 #include "mojo/common/user_agent.h"
-#include "mojo/shell/public/cpp/application_impl.h"
-#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "net/base/data_url.h"
 #include "net/base/ip_address_number.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
 #include "third_party/WebKit/public/platform/WebWaitableEvent.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/gestures/blink/web_gesture_curve_impl.h"
 #include "url/gurl.h"
 
@@ skipping 22 matching lines @@
 
  private:
   scoped_ptr<base::WaitableEvent> impl_;
   DISALLOW_COPY_AND_ASSIGN(WebWaitableEventImpl);
 };
 
 }  // namespace
 
 BlinkPlatformImpl::BlinkPlatformImpl(
     GlobalState* global_state,
-    mojo::ApplicationImpl* app,
+    mojo::Shell* shell,
     scheduler::RendererScheduler* renderer_scheduler)
     : global_state_(global_state),
-      app_(app),
+      shell_(shell),
       main_thread_task_runner_(renderer_scheduler->DefaultTaskRunner()),
       main_thread_(renderer_scheduler->CreateMainThread()) {
-  if (app) {
+  if (shell) {
     scoped_ptr<mojo::ApplicationConnection> connection =
-        app->ConnectToApplication("mojo:network_service");
+        shell->ConnectToApplication("mojo:network_service");
     connection->ConnectToService(&web_socket_factory_);
     connection->ConnectToService(&url_loader_factory_);
 
     mojo::CookieStorePtr cookie_store;
     connection->ConnectToService(&cookie_store);
     cookie_jar_.reset(new WebCookieJarImpl(std::move(cookie_store)));
 
     mojo::ClipboardPtr clipboard;
-    app->ConnectToService("mojo:clipboard", &clipboard);
+    shell->ConnectToService("mojo:clipboard", &clipboard);
     clipboard_.reset(new WebClipboardImpl(std::move(clipboard)));
   }
 }
 
 BlinkPlatformImpl::~BlinkPlatformImpl() {
 }
 
 blink::WebCookieJar* BlinkPlatformImpl::cookieJar() {
   return cookie_jar_.get();
 }
@@ skipping 57 matching lines @@
     blink::WebGraphicsContext3D* share_context) {
   blink::WebGraphicsContext3D::WebGraphicsInfo gl_info;
   return createOffscreenGraphicsContext3D(attributes, share_context, &gl_info);
 }
 
 blink::WebGraphicsContext3D*
 BlinkPlatformImpl::createOffscreenGraphicsContext3D(
     const blink::WebGraphicsContext3D::Attributes& attributes,
     blink::WebGraphicsContext3D* share_context,
     blink::WebGraphicsContext3D::WebGraphicsInfo* gl_info) {
-  // TODO(penghuang): Use the app from the right HTMLDocument.
+  // TODO(penghuang): Use the shell from the right HTMLDocument.
   return WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
-      global_state_, app_, blink::WebStringToGURL(attributes.topDocumentURL),
+      global_state_, shell_, blink::WebStringToGURL(attributes.topDocumentURL),
       attributes, share_context, gl_info);
 }
 
 blink::WebGraphicsContext3D*
 BlinkPlatformImpl::createOffscreenGraphicsContext3D(
     const blink::WebGraphicsContext3D::Attributes& attributes) {
   return createOffscreenGraphicsContext3D(attributes, nullptr, nullptr);
 }
 
 blink::WebGraphicsContext3DProvider*
@@ skipping 119 matching lines @@
 BlinkPlatformImpl::notificationManager() {
   return &web_notification_manager_;
 }
 
 void BlinkPlatformImpl::UpdateWebThreadTLS(blink::WebThread* thread) {
   DCHECK(!current_thread_slot_.Get());
   current_thread_slot_.Set(thread);
 }
 
 }  // namespace html_viewer