Removes ShellPort::IsRunningInMash()

ash/aura/shell_port_classic.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 "ash/aura/shell_port_classic.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 36 matching lines @@
 #endif
 
 namespace ash {
 
 ShellPortClassic::ShellPortClassic() {}
 
 ShellPortClassic::~ShellPortClassic() {}
 
 // static
 ShellPortClassic* ShellPortClassic::Get() {
-  CHECK(!ShellPort::Get()->IsRunningInMash());
+  CHECK(Shell::GetAshConfig() == Config::CLASSIC);
   return static_cast<ShellPortClassic*>(ShellPort::Get());
 }
 
 void ShellPortClassic::Shutdown() {
   if (added_display_observer_)
     Shell::Get()->window_tree_host_manager()->RemoveObserver(this);
 
   pointer_watcher_adapter_.reset();
 
   ShellPort::Shutdown();
 
   Shell::Get()->window_tree_host_manager()->Shutdown();
 }
 
-bool ShellPortClassic::IsRunningInMash() const {
-  return false;
-}
-
 Config ShellPortClassic::GetAshConfig() const {
   return Config::CLASSIC;
 }
 
 WmWindow* ShellPortClassic::GetPrimaryRootWindow() {
   return WmWindow::Get(
       Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow());
 }
 
 WmWindow* ShellPortClassic::GetRootWindowForDisplayId(int64_t display_id) {
@@ skipping 180 matching lines @@
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortClassic::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash