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

content/renderer/renderer_blink_platform_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
 #define CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "cc/blink/web_compositor_support_impl.h"
 #include "content/child/blink_platform_impl.h"
 #include "content/child/child_shared_bitmap_manager.h"
 #include "content/common/content_export.h"
 #include "content/common/url_loader_factory.mojom.h"
+#include "content/renderer/mojo/blink_connector_impl.h"
 #include "content/renderer/origin_trials/web_trial_token_validator_impl.h"
 #include "content/renderer/top_level_blame_context.h"
 #include "content/renderer/webpublicsuffixlist_impl.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBFactory.h"
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationType.h"
 
 namespace IPC {
 class SyncMessageFilter;
 }
 
@@ skipping 13 matching lines @@
 namespace device {
 class MotionData;
 class OrientationData;
 }
 
 namespace service_manager {
 class Connector;
 }
 
 namespace content {
+class BlinkConnectorImpl;
 class BlinkInterfaceProviderImpl;
 class LocalStorageCachedAreas;
 class PlatformEventObserverBase;
 class QuotaMessageFilter;
 class RendererClipboardDelegate;
 class ThreadSafeSender;
 class WebClipboardImpl;
 class WebDatabaseObserverImpl;
 
 class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ skipping 113 matching lines @@
       const blink::WebURL& top_document_web_url,
       blink::WebGraphicsContext3DProvider* share_provider,
       blink::Platform::GraphicsInfo* gl_info) override;
   blink::WebGraphicsContext3DProvider*
   createSharedOffscreenGraphicsContext3DProvider() override;
   gpu::GpuMemoryBufferManager* getGpuMemoryBufferManager() override;
   std::unique_ptr<cc::SharedBitmap> allocateSharedBitmap(
       const blink::WebSize& size) override;
   blink::WebCompositorSupport* compositorSupport() override;
   blink::WebString convertIDNToUnicode(const blink::WebString& host) override;
+  BlinkConnectorImpl* connector() override;
   blink::InterfaceProvider* interfaceProvider() override;
   void startListening(blink::WebPlatformEventType,
                       blink::WebPlatformEventListener*) override;
   void stopListening(blink::WebPlatformEventType) override;
   void queryStorageUsageAndQuota(const blink::WebURL& storage_partition,
                                  blink::WebStorageQuotaType,
                                  blink::WebStorageQuotaCallbacks) override;
   blink::WebThread* currentThread() override;
   blink::BlameContext* topLevelBlameContext() override;
   void recordRappor(const char* metric,
@@ skipping 92 matching lines @@
 
   IDMap<std::unique_ptr<PlatformEventObserverBase>> platform_event_observers_;
 
   blink::scheduler::RendererScheduler* renderer_scheduler_;  // NOT OWNED
   TopLevelBlameContext top_level_blame_context_;
 
   WebTrialTokenValidatorImpl trial_token_validator_;
 
   std::unique_ptr<LocalStorageCachedAreas> local_storage_cached_areas_;
 
+  std::unique_ptr<BlinkConnectorImpl> blink_connector_;
+
   std::unique_ptr<BlinkInterfaceProviderImpl> blink_interface_provider_;
 
   mojom::URLLoaderFactoryAssociatedPtr url_loader_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererBlinkPlatformImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_