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

third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationDispatcher.cpp

Index: third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationDispatcher.cpp
diff --git a/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationDispatcher.cpp b/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationDispatcher.cpp
index 4e6defe840e334589ef3a8bebdcbe575a094c49b..6e9e62c1c63249408912446811293c804380e54a 100644
--- a/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationDispatcher.cpp
+++ b/third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationDispatcher.cpp
@@ -4,7 +4,7 @@
 
 #include "modules/screen_orientation/ScreenOrientationDispatcher.h"
 
-#include "platform/ServiceConnector.h"
+#include "public/platform/Connector.h"
 #include "public/platform/Platform.h"
 #include "services/device/public/interfaces/constants.mojom-blink.h"
 
@@ -29,7 +29,7 @@ DEFINE_TRACE(ScreenOrientationDispatcher) {
 void ScreenOrientationDispatcher::startListening() {
   DCHECK(!m_listener);
 
-  ServiceConnector::instance().connectToInterface(
+  Platform::current()->connector()->bindInterface(
       device::mojom::blink::kServiceName, mojo::MakeRequest(&m_listener));
   m_listener->Start();
 }