summaryrefslogtreecommitdiffstats
path: root/extensions/browser/mojo
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-02-09 23:46:20 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-10 07:47:21 +0000
commit957879558abff482bb4703864046a761ae1a55da (patch)
treed27e479648a4c7ddeba13db89be31e56811f7144 /extensions/browser/mojo
parent9db5ee80adcb1fe1e6feb715f391e08446c8a52c (diff)
downloadchromium_src-957879558abff482bb4703864046a761ae1a55da.zip
chromium_src-957879558abff482bb4703864046a761ae1a55da.tar.gz
chromium_src-957879558abff482bb4703864046a761ae1a55da.tar.bz2
Rename ServiceProvider to InterfaceProvider.
TBR=rockot@chromium.org R=tsepez@chromium.org BUG= CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation Review URL: https://codereview.chromium.org/1684783002 Cr-Commit-Position: refs/heads/master@{#374620}
Diffstat (limited to 'extensions/browser/mojo')
-rw-r--r--extensions/browser/mojo/stash_backend_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/mojo/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc
index 3f43954..abaae12 100644
--- a/extensions/browser/mojo/stash_backend_unittest.cc
+++ b/extensions/browser/mojo/stash_backend_unittest.cc
@@ -12,7 +12,7 @@
#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 {
@@ -191,7 +191,7 @@ TEST_F(StashServiceTest, NotifyOnReadableHandle) {
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.
@@ -202,7 +202,7 @@ TEST_F(StashServiceTest, NotifyOnReadableHandle) {
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_);