Renames window_manager.mojom to window_manager2.mojom

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"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
-#include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h"
+#include "mojo/services/public/interfaces/window_manager2/window_manager2.mojom.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
 
 const char kTestServiceURL[] = "mojo:test_url";
 
 void EmptyResultCallback(bool result) {}
 
@@ skipping 11 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;
 }
 
-class TestWindowManagerClient : public WindowManagerClient {
+class TestWindowManagerClient : public WindowManagerClient2 {
  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) {
     focus_changed_callback_ = callback;
@@ skipping 124 matching lines @@
 
   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_;
+  WindowManagerService2Ptr window_manager_;
 
  private:
   // Overridden from testing::Test:
   virtual void SetUp() override {
     test_helper_.Init();
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(new TestApplicationLoader(base::Bind(
             &WindowManagerApiTest::OnRootAdded, base::Unretained(this)))),
         GURL(kTestServiceURL));
     test_helper_.application_manager()->ConnectToService(
@@ skipping 63 matching lines @@
 
   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