Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1381)

Unified Diff: mojo/shell/shell_test_helper.cc

Issue 265793015: Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« mojo/service_manager/service_manager.cc ('K') | « mojo/shell/shell_test_helper.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/shell_test_helper.cc
diff --git a/mojo/shell/shell_test_helper.cc b/mojo/shell/shell_test_helper.cc
index c530140b2b1e8bdda880ecb14cb5dc70a055bb0c..b7667e3157915176e59826e9a5359068d859e0c0 100644
--- a/mojo/shell/shell_test_helper.cc
+++ b/mojo/shell/shell_test_helper.cc
@@ -19,7 +19,7 @@ namespace shell {
struct ShellTestHelper::State {
scoped_ptr<Context> context;
scoped_ptr<ServiceManager::TestAPI> test_api;
- ScopedShellHandle shell_handle;
+ ScopedMessagePipeHandle shell_handle;
};
namespace {
@@ -79,7 +79,8 @@ void ShellTestHelper::Init() {
void ShellTestHelper::OnShellStarted() {
DCHECK(state_);
shell_client_.reset(new TestShellClient);
- shell_.reset(state_->shell_handle.Pass(), shell_client_.get());
+ shell_ = MakeProxy<Shell>(state_->shell_handle.Pass());
+ shell_->SetClient(shell_client_.get());
run_loop_->Quit();
}
« mojo/service_manager/service_manager.cc ('K') | « mojo/shell/shell_test_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698