Revert of Moves ash content specific tests into ash_content_unittests

chrome/test/base/browser_with_test_window_test.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 CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 
 #include "base/at_exit.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 13 matching lines @@
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 class GURL;
 
 #if defined(OS_CHROMEOS)
 namespace ash {
 namespace test {
-class AshTestEnvironment;
 class AshTestHelper;
 }
 }
 #elif defined(TOOLKIT_VIEWS)
 namespace views {
 class ScopedViewsTestHelper;
 }
 #endif
 
 namespace content {
@@ skipping 120 matching lines @@
   // frameworks.
   TestingProfile* profile_;
   std::unique_ptr<BrowserWindow> window_;  // Usually a TestBrowserWindow.
   std::unique_ptr<Browser> browser_;
 
   // The existence of this object enables tests via
   // RenderViewHostTester.
   content::RenderViewHostTestEnabler rvh_test_enabler_;
 
 #if defined(OS_CHROMEOS)
-  std::unique_ptr<ash::test::AshTestEnvironment> ash_test_environment_;
   std::unique_ptr<ash::test::AshTestHelper> ash_test_helper_;
 #elif defined(TOOLKIT_VIEWS)
   std::unique_ptr<views::ScopedViewsTestHelper> views_test_helper_;
 #endif
 
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   // The type of browser to create (tabbed or popup).
   Browser::Type browser_type_;
 
   // Whether the browser is part of a hosted app.
   bool hosted_app_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_