Begin to wean child processes off reliance on a persistent service_manager::Connection to the brows…

content/public/test/mock_render_thread.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_PUBLIC_TEST_MOCK_RENDER_THREAD_H_
 #define CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/shared_memory.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "content/public/renderer/render_thread.h"
 #include "ipc/ipc_test_sink.h"
 #include "ipc/message_filter.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "third_party/WebKit/public/web/WebPopupType.h"
 
 struct FrameHostMsg_CreateChildFrame_Params;
 
 namespace IPC {
 class MessageFilter;
 class MessageReplyDeserializer;
 }
 
@@ skipping 53 matching lines @@
   base::WaitableEvent* GetShutdownEvent() override;
   int32_t GetClientId() override;
   scoped_refptr<base::SingleThreadTaskRunner> GetTimerTaskRunner() override;
   scoped_refptr<base::SingleThreadTaskRunner> GetLoadingTaskRunner() override;
 #if defined(OS_WIN)
   void PreCacheFont(const LOGFONT& log_font) override;
   void ReleaseCachedFonts() override;
 #endif
   ServiceManagerConnection* GetServiceManagerConnection() override;
   service_manager::InterfaceRegistry* GetInterfaceRegistry() override;
-  service_manager::InterfaceProvider* GetRemoteInterfaces() override;
+  service_manager::Connector* GetConnector() override;
   void SetFieldTrialGroup(const std::string& trial_name,
                           const std::string& group_name) override;
 
   //////////////////////////////////////////////////////////////////////////
   // The following functions are called by the test itself.
 
   void set_routing_id(int32_t id) { routing_id_ = id; }
 
   int32_t opener_id() const { return opener_id_; }
 
@@ skipping 57 matching lines @@
   std::unique_ptr<IPC::MessageReplyDeserializer> reply_deserializer_;
 
   // A list of message filters added to this thread.
   std::vector<scoped_refptr<IPC::MessageFilter> > filters_;
 
   // Observers to notify.
   base::ObserverList<RenderThreadObserver> observers_;
 
   cc::TestSharedBitmapManager shared_bitmap_manager_;
   std::unique_ptr<service_manager::InterfaceRegistry> interface_registry_;
-  std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces_;
-  service_manager::mojom::InterfaceProviderRequest
-      pending_remote_interface_provider_request_;
+  std::unique_ptr<service_manager::Connector> connector_;
+  service_manager::mojom::ConnectorRequest pending_connector_request_;
 
   std::unique_ptr<mojom::RenderMessageFilter> mock_render_message_filter_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_