ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS.

services/ui/display/screen_manager_ozone.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/display/screen_manager_ozone.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
-#include "base/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chromeos/system/devicemode.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/display/manager/chromeos/display_change_observer.h"
 #include "ui/display/manager/display_layout_store.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/screen.h"
 #include "ui/display/screen_base.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/fake_display_controller.h"
 #include "ui/display/types/native_display_delegate.h"
@@ skipping 117 matching lines @@
 
   // Tests may inject a NativeDisplayDelegate, otherwise get it from
   // OzonePlatform.
   if (!native_display_delegate_) {
     native_display_delegate_ =
         ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
   }
 
   // The FakeDisplayController gives us a way to make the NativeDisplayDelegate
   // pretend something display related has happened.
-  if (!base::SysInfo::IsRunningOnChromeOS()) {
+  if (!chromeos::IsRunningAsSystemCompositor()) {
     fake_display_controller_ =
         native_display_delegate_->GetFakeDisplayController();
   }
 
   // Create a new Screen instance.
   std::unique_ptr<ScreenBase> screen = base::MakeUnique<ScreenBase>();
   Screen::SetScreenInstance(screen.get());
   screen_ = screen.get();
 
   // Configure display manager. ScreenManager acts as an observer to find out
@@ skipping 207 matching lines @@
   controller_bindings_.AddBinding(this, std::move(request));
 }
 
 void ScreenManagerOzone::Create(
     const service_manager::Identity& remote_identity,
     mojom::TestDisplayControllerRequest request) {
   test_bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display