Converts most of WorkspaceLayoutManager tests to use common code

ash/common/test/ash_test.h

 // 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.
 
 #ifndef ASH_COMMON_TEST_ASH_TEST_H_
 #define ASH_COMMON_TEST_ASH_TEST_H_
 
 #include <memory>
 #include <string>
 
 #include "ash/common/shell_window_ids.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/views/widget/widget.h"
 #include "ui/wm/public/window_types.h"
 
 namespace display {
 class Display;
 }
 
 namespace ash {
 
 class AshTestImpl;
+class WmShelf;
 class WmWindow;
 
 // Wraps a WmWindow calling WmWindow::Destroy() from the destructor. WmWindow is
 // owned by the corresponding window implementation. The only way to delete
 // WmWindow is to call WmWindow::Destroy(), which deletes the corresponding
 // window, then the WmWindow. This class calls WmWindow::Destroy() from its
 // destructor.
 class WindowOwner {
  public:
   explicit WindowOwner(WmWindow* window);
@@ skipping 12 matching lines @@
 // ash/common and run in both mus and aura.
 //
 // The implementation of AshTestImpl that is used depends upon gn targets. To
 // use the aura backend depend on "//ash:ash_with_aura_test_support." The mus
 // backend is not provided as a separate link target.
 class AshTest : public testing::Test {
  public:
   AshTest();
   ~AshTest() override;
 
+  // Returns true if running in mash.
+  static bool IsMash();

[James Cook, 2016/10/04 23:16:04]

We have WmShell::Get()->IsRunningInMash() now. How about renaming this function
IsRunningInMash() for consistency with the //chrome and //ash codebases, and
implementing it directly in ash_test.cc?

I find it confusing when static functions are implemented in multiple different
.cc files.

[sky, 2016/10/06 17:57:06]

I forgot about that one. Done.
Agreed, but it's a common pattern for some things.

+
   bool SupportsMultipleDisplays() const;
 
   // Update the display configuration as given in |display_spec|.
   // See test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_spec);
 
   // Creates a top level visible window in the appropriate container. If
   // |bounds_in_screen| is empty the window is added to the primary root window,
   // otherwise the window is added to the display matching |bounds_in_screen|.
   // |shell_window_id| is the shell window id to give to the new window.
   std::unique_ptr<WindowOwner> CreateTestWindow(
       const gfx::Rect& bounds_in_screen = gfx::Rect(),
       ui::wm::WindowType type = ui::wm::WINDOW_TYPE_NORMAL,
       int shell_window_id = kShellWindowId_Invalid);
 
+  // Creates a visible top-level window. For aura a top-level window is a Window

[James Cook, 2016/10/04 23:16:04]

From the description it's a little hard to tell how this is different than the
above function, which also creates a top level visible window. Is there some
other way to explain the difference?

Could the two functions be collapsed together?

[sky, 2016/10/06 17:57:06]

I added a reference to aura::Window::GetToplevelWindow(). But I agree it's a bit
strange. AshTestBase uses a non-null delegate supplied to
CreateTestWindowInShellWithDelegate() to differentiate these. IMO that name is
not any clearer.
Indeed it could, but I think it would result in more optional args and most
likely a type to CreateTestWindow. I think it's arguably clearer and less code
with this approach.

+  // that has a delegate.
+  std::unique_ptr<WindowOwner> CreateToplevelTestWindow(
+      const gfx::Rect& bounds_in_screen = gfx::Rect(),
+      int shell_window_id = kShellWindowId_Invalid);
+
   // Creates a visible window parented to |parent| with the specified bounds and
   // id.
   std::unique_ptr<WindowOwner> CreateChildWindow(
       WmWindow* parent,
       const gfx::Rect& bounds = gfx::Rect(),
       int shell_window_id = kShellWindowId_Invalid);
 
   // Returns the Display for the secondary display. It's assumed there are two
   // displays.
   display::Display GetSecondaryDisplay();
 
   // Sets the placement of the secondary display. Returns true if the secondary
   // display can be moved, false otherwise. The false return value is temporary
   // until mus fully supports this.
   bool SetSecondaryDisplayPlacement(
       display::DisplayPlacement::Position position,
       int offset);
 
+  // Configures |init_params| so that the widget will be created on the same
+  // display as |window|.
+  void ConfigureWidgetInitParamsForDisplay(
+      WmWindow* window,
+      views::Widget::InitParams* init_params);
+
+  // Returns the WmShelf for the primary display.
+  WmShelf* GetPrimaryShelf();

[James Cook, 2016/10/04 23:16:04]

static and (optionally) move up

I think there are existing tests that assume they can call
AshTestBase::GetPrimaryShelf() in static helper methods.

[sky, 2016/10/06 17:57:06]

Done.

+
+  // Adds |window| to the appropriate container in the primary root window.
+  void ParentWindowInPrimaryRootWindow(WmWindow* window);
+
+  // Adds |window| as as a transient child of |parent|.
+  void AddTransientChild(WmWindow* parent, WmWindow* window);
+
+  void SetCanLockScreen(bool can_lock_screen);

[James Cook, 2016/10/04 23:16:04]

Function comment? "Lock" means signout-related-lock, I presume.

[sky, 2016/10/06 17:57:06]

Done.

+
+  void RunAllPendingInMessageLoop();
+
  protected:
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
  private:
   std::unique_ptr<AshTestImpl> test_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTest);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_TEST_ASH_TEST_H_