Rename ServiceProvider to InterfaceProvider.

extensions/browser/mojo/stash_backend_unittest.cc

 // Copyright 2014 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 "extensions/browser/mojo/stash_backend.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 namespace {
 
 // Create a data pipe, write some data to the producer handle and return the
 // consumer handle.
 mojo::ScopedHandle CreateReadableHandle() {
   mojo::ScopedDataPipeConsumerHandle consumer_handle;
   mojo::ScopedDataPipeProducerHandle producer_handle;
@@ skipping 158 matching lines @@
   ASSERT_TRUE(!stashed_objects.is_null());
   EXPECT_EQ(0u, stashed_objects.size());
 }
 
 TEST_F(StashServiceTest, NotifyOnReadableHandle) {
   mojo::Array<StashedObjectPtr> stash_entries;
   StashedObjectPtr stashed_object(StashedObject::New());
   stashed_object->id = "test type";
   stashed_object->data.push_back(0);
   stashed_object->monitor_handles = true;
-  mojo::ServiceProviderPtr service_provider;
+  mojo::InterfaceProviderPtr service_provider;
 
   // Stash the ServiceProvider request. When we make a call on
   // |service_provider|, the stashed handle will become readable.
   stashed_object->stashed_handles.push_back(mojo::ScopedHandle::From(
       mojo::GetProxy(&service_provider).PassMessagePipe()));
 
   stash_entries.push_back(std::move(stashed_object));
   stash_service_->AddToStash(std::move(stash_entries));
 
   mojo::MessagePipe pipe;
-  service_provider->ConnectToService("", std::move(pipe.handle0));
+  service_provider->GetInterface("", std::move(pipe.handle0));
 
   WaitForEvent(EVENT_HANDLE_READY);
   EXPECT_EQ(1, handles_ready_);
 }
 
 TEST_F(StashServiceTest, NotifyOnReadableDataPipeHandle) {
   mojo::Array<StashedObjectPtr> stash_entries;
   StashedObjectPtr stashed_object(StashedObject::New());
   stashed_object->id = "test type";
   stashed_object->monitor_handles = true;
@@ skipping 76 matching lines @@
   ASSERT_EQ(0u, stashed_objects.size());
   // Check that the stashed handle has been closed.
   MojoResult result =
       mojo::Wait(message_pipe.handle1.get(),
                  MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_READABLE,
                  MOJO_DEADLINE_INDEFINITE, nullptr);
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
 }
 
 }  // namespace extensions