[WIP] ScreenManager: Add an external window mode

services/ui/ws/test_utils.cc

 // Copyright 2016 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 "services/ui/ws/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 109 matching lines @@
   DCHECK(display_ids_.count(id) == 1);
   delegate_->OnDisplayModified(id, metrics);
 }
 
 void TestScreenManager::RemoveDisplay(int64_t id) {
   DCHECK(display_ids_.count(id) == 1);
   delegate_->OnDisplayRemoved(id);
   display_ids_.erase(id);
 }
 
-void TestScreenManager::Init(display::ScreenManagerDelegate* delegate) {
+void TestScreenManager::Init(display::ScreenManagerDelegate* delegate,
+                             WindowMode window_mode) {
   // Reset
   delegate_ = delegate;
   display_ids_.clear();
   primary_display_id_ = display::kInvalidDisplayId;
 }
 
 int64_t TestScreenManager::GetPrimaryDisplayId() const {
   return primary_display_id_;
 }
 
@@ skipping 307 matching lines @@
   DCHECK(!client_after_reset_);
   client_after_reset_ = base::MakeUnique<TestWindowTreeClient>();
   return client_after_reset_.get();
 }
 
 // TestWindowServerDelegate ----------------------------------------------
 
 TestWindowServerDelegate::TestWindowServerDelegate() {}
 TestWindowServerDelegate::~TestWindowServerDelegate() {}
 
-void TestWindowServerDelegate::StartDisplayInit() {}
+void TestWindowServerDelegate::StartDisplayInit(bool window_manager_connected) {
+}
 
 void TestWindowServerDelegate::OnNoMoreDisplays() {
   got_on_no_more_displays_ = true;
 }
 
 std::unique_ptr<WindowTreeBinding>
 TestWindowServerDelegate::CreateWindowTreeBinding(
     BindingType type,
     ws::WindowServer* window_server,
     ws::WindowTree* tree,
@@ skipping 164 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui