Kill ShellConnection::WaitForInitialize

mojo/shell/public/cpp/lib/shell_test.cc

Index: mojo/shell/public/cpp/lib/shell_test.cc
diff --git a/mojo/shell/public/cpp/lib/shell_test.cc b/mojo/shell/public/cpp/lib/shell_test.cc
index 624fdc5525aea12a8a8aac3a0dd740f28f6fbaec..1a89d180891f42163d5fbf07010848b18be40767 100644
--- a/mojo/shell/public/cpp/lib/shell_test.cc
+++ b/mojo/shell/public/cpp/lib/shell_test.cc
@@ -16,7 +16,7 @@ ShellTestClient::~ShellTestClient() {}
 
 void ShellTestClient::Initialize(Connector* connector, const Identity& identity,
                                  uint32_t id) {
-  test_->InitializeCalled(connector, identity.name(), identity.user_id(), id);
+  test_->InitializeCalled(identity.name(), identity.user_id(), id);
 }
 
 ShellTest::ShellTest() {}
@@ -32,11 +32,9 @@ scoped_ptr<ShellClient> ShellTest::CreateShellClient() {
   return make_scoped_ptr(new ShellTestClient(this));
 }
 
-void ShellTest::InitializeCalled(Connector* connector,
-                                 const std::string& name,
+void ShellTest::InitializeCalled(const std::string& name,
                                  const std::string& user_id,
                                  uint32_t id) {
-  connector_ = connector;
   initialize_name_ = name;
   initialize_instance_id_ = id;
   initialize_userid_ = user_id;
@@ -50,7 +48,7 @@ void ShellTest::SetUp() {
   shell_connection_.reset(new ShellConnection(
       shell_client_.get(),
       background_shell_->CreateShellClientRequest(test_name_)));
-  shell_connection_->WaitForInitialize();
+  connector_ = shell_connection_->connector();
 }
 
 void ShellTest::TearDown() {