chromeos: Makes AshTestBase/Helper target mash when appropriate

ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/key_event_watcher.h"
@@ skipping 99 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
 WmShellMus::WmShellMus(
     WmWindow* primary_root_window,
     std::unique_ptr<ShellDelegate> shell_delegate,
     WindowManager* window_manager,
-    views::PointerWatcherEventRouter* pointer_watcher_event_router)
+    views::PointerWatcherEventRouter* pointer_watcher_event_router,
+    bool create_session_state_delegate_stub)
     : WmShell(std::move(shell_delegate)),
       window_manager_(window_manager),
       primary_root_window_(primary_root_window),
-      pointer_watcher_event_router_(pointer_watcher_event_router),
-      session_state_delegate_(new SessionStateDelegateStub) {
+      pointer_watcher_event_router_(pointer_watcher_event_router) {
+  if (create_session_state_delegate_stub)
+    session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();

[James Cook, 2017/02/18 02:23:20]

Should this be session_state_delegate_for_testing_? It seems like the
distinction is test vs. production (which uses Shell).

Also, it might be clearer if WmShellMus just took a unique_ptr<>
session_state_delegate_for_test parameter.

[sky, 2017/02/18 18:00:57]

We were always creating SessionStateDelegateStub before. Maybe you're suggesting
I invert the meaning?
I'm hoping this code is temporary, (the creation of the stub). You and Mike are
more familiar with this. I'm going to redirect this to Mike, who can suggest the
right approach.

   DCHECK(primary_root_window_);
   WmShell::Set(this);
 
   uint16_t accelerator_namespace_id = 0u;
   const bool add_result =
       window_manager->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
   // WmShellMus is created early on, so that this should always succeed.
   DCHECK(add_result);
   accelerator_controller_delegate_.reset(
       new AcceleratorControllerDelegateMus(window_manager_));
@@ skipping 227 matching lines @@
   for (auto& observer : *shell_observers())
     observer.OnOverviewModeStarting();
 }
 
 void WmShellMus::OnOverviewModeEnded() {
   for (auto& observer : *shell_observers())
     observer.OnOverviewModeEnded();
 }
 
 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() {
-  return session_state_delegate_.get();
+  return session_state_delegate_
+             ? session_state_delegate_.get()
+             : Shell::GetInstance()->session_state_delegate();
 }
 
 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 32 matching lines @@
 }
 
 void WmShellMus::CreatePrimaryHost() {}
 
 void WmShellMus::InitHosts(const ShellInitParams& init_params) {
   window_manager_->CreatePrimaryRootWindowController(
       base::WrapUnique(init_params.primary_window_tree_host));
 }
 }  // namespace mus
 }  // namespace ash