chromeos: converts DragImageViewTest to AshTestBase

ash/test/ash_test_base.h

 // Copyright (c) 2012 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_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
+#include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/display/display.h"
 #include "ui/wm/public/window_types.h"
 
 namespace aura {
 class Window;
@@ skipping 61 matching lines @@
   // primary root Window.
   aura::Window* CurrentContext();
 
   // Creates and shows a widget. See ash/public/cpp/shell_window_ids.h for
   // values for |container_id|.
   static std::unique_ptr<views::Widget> CreateTestWidget(
       views::WidgetDelegate* delegate,
       int container_id,
       const gfx::Rect& bounds);
 
+  // Creates a 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.
+  // TODO(sky): convert existing CreateTestWindow() functions into this one.

[msw, 2017/04/18 21:43:09]

aside q: Will returning a unique_ptr instead of a raw pointer change the window
destruction semantics for the numerous tests calling the existing functions?
(generally I think of tests simply allowing the window to be destroyed later on
via some TearDown mechanism, not via aura::Window destruction in the test
fixture body when the unique_ptr goes out of scope). I imagine this generally
won't be a problem, and a few cases can release the unique_ptr, but I'm just
curious about your thoughts.

[sky, 2017/04/18 22:03:02]

I actually haven't done a big analysis. I generally favor unique_ptr, event if
the callers do a release() as it's less error prone.

+  std::unique_ptr<aura::Window> CreateTestWindow(

[msw, 2017/04/18 21:43:09]

optional nit: order params to match CreateTestWindowInShellWithDelegateAndType;
that might ease some conversion later on.

[sky, 2017/04/18 22:03:02]

I went with this ordering based on looking at tests and seeing most wanting to
specify bounds, and then falling off in usage from there.

+      const gfx::Rect& bounds_in_screen = gfx::Rect(),
+      ui::wm::WindowType type = ui::wm::WINDOW_TYPE_NORMAL,
+      int shell_window_id = kShellWindowId_Invalid);
+
   // Versions of the functions in aura::test:: that go through our shell
   // StackingController instead of taking a parent.
   aura::Window* CreateTestWindowInShellWithId(int id);
   aura::Window* CreateTestWindowInShellWithBounds(const gfx::Rect& bounds);
   aura::Window* CreateTestWindowInShell(SkColor color,
                                         int id,
                                         const gfx::Rect& bounds);
   aura::Window* CreateTestWindowInShellWithDelegate(
       aura::WindowDelegate* delegate,
       int id,
@@ skipping 87 matching lines @@
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_