Nukes the windowmanager interface

components/view_manager/view_manager_service_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 <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/connection_manager_delegate.h"
 #include "components/view_manager/display_manager.h"
 #include "components/view_manager/ids.h"
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/public/cpp/util.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/view_manager/server_view.h"
 #include "components/view_manager/test_change_tracker.h"
 #include "components/view_manager/view_manager_service_impl.h"
-#include "components/window_manager/public/interfaces/window_manager.mojom.h"
-#include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
 using mojo::Array;
 using mojo::ERROR_CODE_NONE;
 using mojo::InterfaceRequest;
 using mojo::ServiceProvider;
 using mojo::ServiceProviderPtr;
@@ skipping 157 matching lines @@
   const mojo::ViewportMetrics& GetViewportMetrics() override {
     return display_metrices_;
   }
 
  private:
   mojo::ViewportMetrics display_metrices_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayManager);
 };
 
-// -----------------------------------------------------------------------------
-
-// Empty implementation of WindowManagerInternal.
-class TestWindowManagerInternal : public mojo::WindowManagerInternal {
- public:
-  TestWindowManagerInternal() {}
-  ~TestWindowManagerInternal() override {}
-
-  // WindowManagerInternal:
-  void SetViewManagerClient(mojo::ScopedMessagePipeHandle) override {}
-  void OnAccelerator(mojo::EventPtr event) override {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestWindowManagerInternal);
-};
-
 mojo::EventPtr CreatePointerDownEvent(int x, int y) {
   mojo::EventPtr event(mojo::Event::New());
   event->action = mojo::EVENT_TYPE_POINTER_DOWN;
   event->pointer_data = mojo::PointerData::New();
   event->pointer_data->pointer_id = 1u;
   event->pointer_data->x = x;
   event->pointer_data->y = y;
   return event.Pass();
 }
 
@@ skipping 30 matching lines @@
   }
 
   ConnectionManager* connection_manager() { return connection_manager_.get(); }
 
   TestViewManagerClient* wm_client() { return wm_client_; }
 
  protected:
   // testing::Test:
   void SetUp() override {
     connection_manager_.reset(new ConnectionManager(
-        &delegate_, scoped_ptr<DisplayManager>(new TestDisplayManager),
-        &wm_internal_));
+        &delegate_, scoped_ptr<DisplayManager>(new TestDisplayManager)));
     scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
         connection_manager_.get(), kInvalidConnectionId, std::string(),
         std::string("mojo:window_manager"), RootViewId()));
     scoped_ptr<TestClientConnection> client_connection(
         new TestClientConnection(service.Pass()));
     wm_client_ = client_connection->client();
     ASSERT_TRUE(wm_client_ != nullptr);
     connection_manager_->SetWindowManagerClientConnection(
         client_connection.Pass());
     ASSERT_TRUE(wm_connection() != nullptr);
     ASSERT_TRUE(wm_connection()->root() != nullptr);
   }
 
  private:
   // TestViewManagerClient that is used for the WM connection.
   TestViewManagerClient* wm_client_;
 
-  TestWindowManagerInternal wm_internal_;
   TestConnectionManagerDelegate delegate_;
   scoped_ptr<ConnectionManager> connection_manager_;
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceTest);
 };
 
 namespace {
 
 const ServerView* GetFirstCloned(const ServerView* view) {
@@ skipping 262 matching lines @@
   EXPECT_EQ(connection_manager()->root(),
             connection_manager()->GetFocusedView());
   ASSERT_EQ(wm_client()->tracker()->changes()->size(), 1u);
   EXPECT_EQ("InputEvent view=0,1 event_action=4",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   EXPECT_TRUE(connection1_client->tracker()->changes()->empty());
   ;
 }
 
 }  // namespace view_manager