Remove OpenWindow from the WindowManager interface.

mojo/services/window_manager/window_manager_api_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 "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ skipping 29 matching lines @@
   bool result = false;
   base::RunLoop run_loop;
   ServiceProviderPtr sp;
   BindToProxy(new ServiceProviderImpl, &sp);
   view_manager_init->Embed(url, sp.Pass(),
                            base::Bind(&ResultCallback, &result, &run_loop));
   run_loop.Run();
   return result;
 }
 
-void OpenWindowCallback(Id* id,
-                        base::RunLoop* run_loop,
-                        Id window_id) {
-  *id = window_id;
-  run_loop->Quit();
-}
-
-Id OpenWindow(WindowManagerService* window_manager) {
-  base::RunLoop run_loop;
-  Id id;
-  window_manager->OpenWindow(
-      base::Bind(&OpenWindowCallback, &id, &run_loop));
-  run_loop.Run();
-  return id;
-}
-
-Id OpenWindowWithURL(WindowManagerService* window_manager,
-                                   const std::string& url) {
-  base::RunLoop run_loop;
-  Id id;
-  window_manager->OpenWindowWithURL(
-      url,
-      base::Bind(&OpenWindowCallback, &id, &run_loop));
-  run_loop.Run();
-  return id;
-}
-
 class TestWindowManagerClient : public WindowManagerClient {
  public:
   typedef base::Callback<void(Id, Id)>
       TwoNodeCallback;
 
   explicit TestWindowManagerClient(base::RunLoop* run_loop)
       : run_loop_(run_loop) {}
   virtual ~TestWindowManagerClient() {}
 
   void set_focus_changed_callback(const TwoNodeCallback& callback) {
@@ skipping 117 matching lines @@
   TwoIds WaitForActiveWindowChange() {
     TwoIds old_and_new;
     base::RunLoop run_loop;
     window_manager_client()->set_active_window_changed_callback(
         base::Bind(&WindowManagerApiTest::OnActiveWindowChanged,
                    base::Unretained(this), &old_and_new, &run_loop));
     run_loop.Run();
     return old_and_new;
   }
 
+  Id OpenWindow() {
+    return OpenWindowWithURL(kTestServiceURL);
+  }
+
+  Id OpenWindowWithURL(const std::string& url) {
+    InitEmbed(view_manager_init_.get(), url);
+    return WaitForEmbed();
+  }
+
   TestWindowManagerClient* window_manager_client() {
     return window_manager_client_.get();
   }
 
   WindowManagerServicePtr window_manager_;
 
  private:
   // Overridden from testing::Test:
   virtual void SetUp() MOJO_OVERRIDE {
     test_helper_.Init();
@@ skipping 51 matching lines @@
   }
 
   shell::ShellTestHelper test_helper_;
   ViewManagerInitServicePtr view_manager_init_;
   scoped_ptr<TestWindowManagerClient> window_manager_client_;
   TestApplicationLoader::RootAddedCallback root_added_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApiTest);
 };
 
-TEST_F(WindowManagerApiTest, OpenWindow) {
-  OpenWindow(window_manager_.get());
-  Id created_node =
-      OpenWindowWithURL(window_manager_.get(), kTestServiceURL);
-  Id embed_node = WaitForEmbed();
-  EXPECT_EQ(created_node, embed_node);
-}
-
 TEST_F(WindowManagerApiTest, FocusAndActivateWindow) {
-  Id first_window = OpenWindow(window_manager_.get());
+  Id first_window = OpenWindow();
   window_manager_->FocusWindow(first_window,
                                base::Bind(&EmptyResultCallback));
   TwoIds ids = WaitForFocusChange();
   EXPECT_TRUE(ids.first == 0);
   EXPECT_EQ(ids.second, first_window);
 
-  Id second_window = OpenWindow(window_manager_.get());
+  Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace mojo