Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: ash/test/ash_interactive_ui_test_base.h

Issue 1297173003: Revert of aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_TEST_ASH_INTERACTIVE_UI_TEST_BASE_H_ 5 #ifndef ASH_TEST_ASH_INTERACTIVE_UI_TEST_BASE_H_
6 #define ASH_TEST_ASH_INTERACTIVE_UI_TEST_BASE_H_ 6 #define ASH_TEST_ASH_INTERACTIVE_UI_TEST_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 11
12 namespace aura {
13 class Env;
14 }
15
16 namespace ash { 12 namespace ash {
17 namespace test { 13 namespace test {
18 14
19 class AshInteractiveUITestBase : public AshTestBase { 15 class AshInteractiveUITestBase : public AshTestBase {
20 public: 16 public:
21 AshInteractiveUITestBase(); 17 AshInteractiveUITestBase();
22 ~AshInteractiveUITestBase() override; 18 ~AshInteractiveUITestBase() override;
23 19
24 protected: 20 protected:
25 // testing::Test: 21 // testing::Test:
26 void SetUp() override; 22 void SetUp() override;
27 void TearDown() override; 23 void TearDown() override;
28 24
29 private: 25 private:
30 scoped_ptr<aura::Env> env_;
31 DISALLOW_COPY_AND_ASSIGN(AshInteractiveUITestBase); 26 DISALLOW_COPY_AND_ASSIGN(AshInteractiveUITestBase);
32 }; 27 };
33 28
34 } // namespace test 29 } // namespace test
35 } // namespace ash 30 } // namespace ash
36 31
37 #endif // ASH_TEST_ASH_INTERACTIVE_UI_TEST_BASE_H_ 32 #endif // ASH_TEST_ASH_INTERACTIVE_UI_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/test/ash_interactive_ui_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698