Rename ServiceProvider to InterfaceProvider.

content/renderer/render_thread_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_RENDER_THREAD_IMPL_H_
 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 432 matching lines @@
   // WidgetRestored is called before WidgetDestroyed for any hidden widget.
   void WidgetDestroyed();
   void WidgetHidden();
   void WidgetRestored();
 
   void AddEmbeddedWorkerRoute(int32_t routing_id, IPC::Listener* listener);
   void RemoveEmbeddedWorkerRoute(int32_t routing_id);
 
   void RegisterPendingRenderFrameConnect(
       int routing_id,
-      mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services);
+      mojo::InterfaceRequest<mojo::InterfaceProvider> services,
+      mojo::InterfaceProviderPtr exposed_services);
 
  protected:
   RenderThreadImpl(const InProcessChildThreadParams& params,
                    scoped_ptr<scheduler::RendererScheduler> scheduler);
   RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop,
                    scoped_ptr<scheduler::RendererScheduler> scheduler);
   virtual void SetResourceDispatchTaskQueue(
     const scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue);
 
  private:
@@ skipping 201 matching lines @@
   std::vector<unsigned> use_image_texture_targets_;
   std::vector<unsigned> use_video_frame_image_texture_targets_;
   bool are_image_decode_tasks_enabled_;
   bool is_threaded_animation_enabled_;
 
   class PendingRenderFrameConnect
       : public base::RefCounted<PendingRenderFrameConnect> {
    public:
     PendingRenderFrameConnect(
         int routing_id,
-        mojo::InterfaceRequest<mojo::ServiceProvider> services,
-        mojo::ServiceProviderPtr exposed_services);
+        mojo::InterfaceRequest<mojo::InterfaceProvider> services,
+        mojo::InterfaceProviderPtr exposed_services);
 
-    mojo::InterfaceRequest<mojo::ServiceProvider>& services() {
+    mojo::InterfaceRequest<mojo::InterfaceProvider>& services() {
       return services_;
     }
 
-    mojo::ServiceProviderPtr& exposed_services() { return exposed_services_; }
+    mojo::InterfaceProviderPtr& exposed_services() { return exposed_services_; }
 
    private:
     friend class base::RefCounted<PendingRenderFrameConnect>;
 
     ~PendingRenderFrameConnect();
 
     // Mojo error handler.
     void OnConnectionError();
 
     int routing_id_;
-    mojo::InterfaceRequest<mojo::ServiceProvider> services_;
-    mojo::ServiceProviderPtr exposed_services_;
+    mojo::InterfaceRequest<mojo::InterfaceProvider> services_;
+    mojo::InterfaceProviderPtr exposed_services_;
   };
 
   typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>>
       PendingRenderFrameConnectMap;
   PendingRenderFrameConnectMap pending_render_frame_connects_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_