Rename ServiceProvider to InterfaceProvider.

mojo/shell/fetcher/about_fetcher_unittest.cc

 // Copyright 2015 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.
 
 #include "mojo/shell/fetcher/about_fetcher.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 45 matching lines @@
   // Overridden from mojom::ContentHandler:
   void StartApplication(
       InterfaceRequest<mojom::ShellClient> request,
       URLResponsePtr response,
       const Callback<void()>& destruct_callback) override {
     response_number_++;
     latest_response_ = std::move(response);
     destruct_callback.Run();
 
     // Drop |application| request. This results in the application manager
-    // dropping the ServiceProvider interface request provided by the client
+    // dropping the InterfaceProvider interface request provided by the client
     // who made the ConnectToApplication() call. Therefore the client could
-    // listen for connection error of the ServiceProvider interface to learn
+    // listen for connection error of the InterfaceProvider interface to learn
     // that StartApplication() has been called.
   }
 
   size_t response_number_;
   URLResponsePtr latest_response_;
   WeakBindingSet<mojom::ContentHandler> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentHandler);
 };
 
@@ skipping 21 matching lines @@
   ~AboutFetcherTest() override {}
 
  protected:
   const TestContentHandler* html_content_handler() const {
     return &html_content_handler_;
   }
 
   void ConnectAndWait(const std::string& url) {
     base::RunLoop run_loop;
 
-    ServiceProviderPtr service_provider;
-    InterfaceRequest<ServiceProvider> service_provider_request =
-        GetProxy(&service_provider);
+    InterfaceProviderPtr remote_interfaces;
+    InterfaceRequest<InterfaceProvider> remote_request =
+        GetProxy(&remote_interfaces);
     // This connection error handler will be called when:
     // - TestContentHandler::StartApplication() has been called (please see
     //   comments in that method); or
     // - the application manager fails to fetch the requested URL.
-    service_provider.set_connection_error_handler(
+    remote_interfaces.set_connection_error_handler(
         [&run_loop]() { run_loop.Quit(); });
 
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->SetTargetURL(GURL(url));
-    params->set_services(std::move(service_provider_request));
+    params->set_remote_interfaces(std::move(remote_request));
     application_manager_->ConnectToApplication(std::move(params));
 
     run_loop.Run();
   }
 
   // Overridden from testing::Test:
   void SetUp() override {
     base::FilePath shell_dir;
     PathService::Get(base::DIR_MODULE, &shell_dir);
     scoped_ptr<PackageManagerImpl> package_manager(
@@ skipping 38 matching lines @@
   const URLResponse* response = html_content_handler()->latest_response();
   EXPECT_EQ("about:some_unrecognized_url", response->url);
   EXPECT_EQ(404u, response->status_code);
   EXPECT_EQ("text/html", response->mime_type);
   EXPECT_FALSE(response->body.is_valid());
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo