Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/shell/shell_test_helper.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 "mojo/shell/shell_test_helper.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
 
 namespace mojo {
 namespace shell {
 
 // State used on the background thread. Be careful, this is created on the main
 // thread than passed to the shell thread. Destruction happens on the shell
 // thread.
 struct ShellTestHelper::State {
   scoped_ptr<Context> context;
   scoped_ptr<ServiceManager::TestAPI> test_api;
-  ScopedShellHandle shell_handle;
+  ScopedMessagePipeHandle shell_handle;
 };
 
 namespace {
 
 void StartShellOnShellThread(ShellTestHelper::State* state) {
   state->context.reset(new Context);
   state->test_api.reset(
       new ServiceManager::TestAPI(state->context->service_manager()));
   state->shell_handle = state->test_api->GetShellHandle();
 }
@@ skipping 39 matching lines @@
       FROM_HERE,
       base::Bind(&StartShellOnShellThread, state_),
       base::Bind(&ShellTestHelper::OnShellStarted, base::Unretained(this)));
   run_loop_.reset(new base::RunLoop);
   run_loop_->Run();
 }
 
 void ShellTestHelper::OnShellStarted() {
   DCHECK(state_);
   shell_client_.reset(new TestShellClient);
-  shell_.reset(state_->shell_handle.Pass(), shell_client_.get());
+  shell_.Bind(state_->shell_handle.Pass());
+  shell_->SetClient(shell_client_.get());
   run_loop_->Quit();
 }
 
 }  // namespace shell
 }  // namespace mojo