Start building core_services.mojo.

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 "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "components/html_viewer/blink_resource_constants.h"
 #include "components/html_viewer/web_clipboard_impl.h"
 #include "components/html_viewer/web_cookie_jar_impl.h"
 #include "components/html_viewer/web_message_port_channel_impl.h"
 #include "components/html_viewer/web_socket_handle_impl.h"
 #include "components/html_viewer/web_thread_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
 #include "net/base/data_url.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/public/platform/WebWaitableEvent.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
 #include "ui/events/gestures/blink/web_gesture_curve_impl.h"
 
 namespace html_viewer {
 namespace {
 
 // Allows overriding user agent scring.
 const char kUserAgentSwitch[] = "user-agent";
 
 // TODO(darin): Figure out what our UA should really be.
 const char kDefaultUserAgentString[] =
@@ skipping 27 matching lines @@
       shared_timer_suspended_(0),
       current_thread_slot_(&DestroyCurrentThread),
       scheduler_(main_loop_->message_loop_proxy()) {
   if (app) {
     app->ConnectToService("mojo:network_service", &network_service_);
 
     mojo::CookieStorePtr cookie_store;
     network_service_->GetCookieStore(GetProxy(&cookie_store));
     cookie_jar_.reset(new WebCookieJarImpl(cookie_store.Pass()));
 
+    mojo::ServiceProviderPtr service_provider;
+    app->ConnectToService("mojo:core_services", &service_provider);
     mojo::ClipboardPtr clipboard;
-    app->ConnectToService("mojo:clipboard", &clipboard);
+    mojo::ConnectToService(service_provider.get(), &clipboard);
     clipboard_.reset(new WebClipboardImpl(clipboard.Pass()));
   }
 }
 
 BlinkPlatformImpl::~BlinkPlatformImpl() {
 }
 
 blink::WebCookieJar* BlinkPlatformImpl::cookieJar() {
   return cookie_jar_.get();
 }
@@ skipping 227 matching lines @@
 }
 
 // static
 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) {
   WebThreadImplForMessageLoop* impl =
       static_cast<WebThreadImplForMessageLoop*>(thread);
   delete impl;
 }
 
 }  // namespace html_viewer