Remove [Client=] annotation from ServiceProvider

sky/viewer/internals.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 "sky/viewer/internals.h"
 
 #include "mojo/edk/js/core.h"
 #include "mojo/edk/js/handle.h"
 #include "mojo/edk/js/support.h"
 #include "mojo/edk/js/threading.h"
@@ skipping 21 matching lines @@
   object->Set(gin::StringToV8(isolate, "support"),
               mojo::js::Support::GetModule(isolate));
   object->Set(gin::StringToV8(isolate, "threading"),
               mojo::js::Threading::GetModule(isolate));
   return internals;
 }
 
 Internals::Internals(DocumentView* document_view)
   : document_view_(document_view->GetWeakPtr()),
     shell_binding_(this) {
-  mojo::ConnectToService(document_view->imported_services(), &test_harness_);
 }
 
 Internals::~Internals() {
 }
 
 gin::ObjectTemplateBuilder Internals::GetObjectTemplateBuilder(
     v8::Isolate* isolate) {
   return Wrappable<Internals>::GetObjectTemplateBuilder(isolate)
       .SetMethod("renderTreeAsText", &Internals::RenderTreeAsText)
       .SetMethod("contentAsText", &Internals::ContentAsText)
@@ skipping 12 matching lines @@
 }
 
 std::string Internals::ContentAsText() {
   if (!document_view_)
     return std::string();
   return document_view_->web_view()->mainFrame()->contentAsText(
       1024*1024).utf8();
 }
 
 void Internals::NotifyTestComplete(const std::string& test_result) {
+  if (!document_view_->imported_services())
+    return;  // Can't call NotifyTestComplete without a test_harness_ impl.
   std::vector<unsigned char> pixels;
   document_view_->GetPixelsForTesting(&pixels);
+  mojo::ConnectToService(document_view_->imported_services(), &test_harness_);
   test_harness_->OnTestComplete(test_result,
       mojo::Array<uint8_t>::From(pixels));
 }
 
 mojo::Handle Internals::ConnectToEmbedderService(
     const std::string& interface_name) {
-  if (!document_view_)
+  if (!document_view_ || !document_view_->imported_services())
     return mojo::Handle();
 
   mojo::MessagePipe pipe;
   document_view_->imported_services()->ConnectToService(interface_name,
                                                         pipe.handle1.Pass());
   return pipe.handle0.release();
 }
 
 // Returns a MessagePipe handle that's connected to this Shell. The caller
 // owns the handle and is expected to use it to create the JS Application for
@@ skipping 30 matching lines @@
 }
 
 void Internals::pauseAnimations(double pauseTime) {
   if (pauseTime < 0)
     return;
 
     document_view_->web_view()->mainFrame()->document().pauseAnimationsForTesting(pauseTime);
 }
 
 }  // namespace sky