chromeos: Move files in //ash/common to //ash, part 2

ash/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_
+#ifndef ASH_TEST_ASH_TEST_H_
+#define ASH_TEST_ASH_TEST_H_
 
 #include <memory>
 #include <string>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display_layout.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/widget/widget.h"
@@ skipping 31 matching lines @@
   WmWindow* window() { return window_; }
 
  private:
   WmWindow* window_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowOwner);
 };
 
 // Base class for ash tests. This class calls through to AshTestImpl for the
 // real implementation. This class exists so that tests can be written to
-// ash/common and run in both mus and aura.
+// run in both mus ash and classic ash.
 //
 // The implementation of AshTestImpl that is used depends upon gn targets. To
 // use the aura backend depend on "//ash/test: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 the WmShelf for the primary display.
@@ skipping 70 matching lines @@
   void TearDown() override;
 
  private:
   std::unique_ptr<AshTestImpl> test_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTest);
 };
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_TEST_ASH_TEST_H_
+#endif  // ASH_TEST_ASH_TEST_H_