Refactor Blink's ServiceConnector and add ability to mock in layout tests

third_party/WebKit/public/platform/Platform.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 52 matching lines @@
 }
 
 namespace v8 {
 class Context;
 template <class T>
 class Local;
 }
 
 namespace blink {
 
+class Connector;
 class InterfaceProvider;
 class WebAudioBus;
 class WebBlobRegistry;
 class WebCanvasCaptureHandler;
 class WebClipboard;
 class WebCompositorSupport;
 class WebCookieJar;
 class WebCrypto;
 class WebDatabaseObserver;
 class WebPlatformEventListener;
@@ skipping 500 matching lines @@
   virtual bool allowScriptExtensionForServiceWorker(const WebURL& scriptUrl) {
     return false;
   }
 
   // WebCrypto ----------------------------------------------------------
 
   virtual WebCrypto* crypto() { return nullptr; }
 
   // Mojo ---------------------------------------------------------------
 
+  virtual Connector* connector();
+
   virtual InterfaceProvider* interfaceProvider();
 
-  // Sets up a connection to the ServiceManager by binding |remoteHandle| to a
-  // remote implementation of
-  // //service_manager/public/interfaces/connector.mojom. Using this connection
-  // the caller can then request connections to other services.
-  // NOTE: This handle is not strongly typed because neither the Blink nor
-  // Chromium types generated from connector.mojom should leak across the
-  // Blink-Chromium boundary.
-  virtual void bindServiceConnector(mojo::ScopedMessagePipeHandle remoteHandle);
-
   // Platform events -----------------------------------------------------
   // Device Orientation, Device Motion, Device Light, Battery, Gamepad.
 
   // Request the platform to start listening to the events of the specified
   // type and notify the given listener (if not null) when there is an update.
   virtual void startListening(WebPlatformEventType type,
                               WebPlatformEventListener* listener) {}
 
   // Request the platform to stop listening to the specified event and no
   // longer notify the listener, if any.
@@ skipping 58 matching lines @@
  protected:
   Platform();
   virtual ~Platform() {}
 
   WebThread* m_mainThread;
 };
 
 }  // namespace blink
 
 #endif