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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_TEST_BASE_H_ 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_
6 #define ASH_TEST_ASH_TEST_BASE_H_ 6 #define ASH_TEST_ASH_TEST_BASE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
oshima 2016/04/08 07:09:42 #include?
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "content/public/test/test_browser_thread_bundle.h" 16 #include "content/public/test/test_browser_thread_bundle.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
19 #include "ui/gfx/display.h" 19 #include "ui/gfx/display.h"
20 #include "ui/wm/public/window_types.h" 20 #include "ui/wm/public/window_types.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 void BlockUserSession(UserSessionBlockReason block_reason); 141 void BlockUserSession(UserSessionBlockReason block_reason);
142 void UnblockUserSession(); 142 void UnblockUserSession();
143 143
144 void DisableIME(); 144 void DisableIME();
145 145
146 private: 146 private:
147 bool setup_called_; 147 bool setup_called_;
148 bool teardown_called_; 148 bool teardown_called_;
149 // |SetUp()| doesn't activate session if this is set to false. 149 // |SetUp()| doesn't activate session if this is set to false.
150 bool start_session_; 150 bool start_session_;
151 scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_; 151 std::unique_ptr<content::TestBrowserThreadBundle> thread_bundle_;
152 scoped_ptr<AshTestHelper> ash_test_helper_; 152 std::unique_ptr<AshTestHelper> ash_test_helper_;
153 scoped_ptr<ui::test::EventGenerator> event_generator_; 153 std::unique_ptr<ui::test::EventGenerator> event_generator_;
154 #if defined(OS_WIN) 154 #if defined(OS_WIN)
155 ui::ScopedOleInitializer ole_initializer_; 155 ui::ScopedOleInitializer ole_initializer_;
156 #endif 156 #endif
157 157
158 DISALLOW_COPY_AND_ASSIGN(AshTestBase); 158 DISALLOW_COPY_AND_ASSIGN(AshTestBase);
159 }; 159 };
160 160
161 class NoSessionAshTestBase : public AshTestBase { 161 class NoSessionAshTestBase : public AshTestBase {
162 public: 162 public:
163 NoSessionAshTestBase() { 163 NoSessionAshTestBase() {
164 set_start_session(false); 164 set_start_session(false);
165 } 165 }
166 ~NoSessionAshTestBase() override {} 166 ~NoSessionAshTestBase() override {}
167 167
168 private: 168 private:
169 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 169 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
170 }; 170 };
171 171
172 } // namespace test 172 } // namespace test
173 } // namespace ash 173 } // namespace ash
174 174
175 #endif // ASH_TEST_ASH_TEST_BASE_H_ 175 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698