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

Side by Side Diff: chrome/test/base/in_process_browser_test.h

Issue 2876153002: Support Using ScopedFeatureList in BrowserTest (Closed)
Patch Set: leave tests and changes in test_suites to following patch Created 3 years, 5 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
« no previous file with comments | « chrome/common/chrome_features.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 5 #ifndef CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
6 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 6 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/test/scoped_feature_list.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
15 #include "content/public/test/browser_test.h" 16 #include "content/public/test/browser_test.h"
16 #include "content/public/test/browser_test_base.h" 17 #include "content/public/test/browser_test_base.h"
17 #include "storage/browser/quota/quota_settings.h" 18 #include "storage/browser/quota/quota_settings.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 #include "ui/base/page_transition_types.h" 20 #include "ui/base/page_transition_types.h"
20 21
21 #if defined(OS_MACOSX) 22 #if defined(OS_MACOSX)
22 #include "ui/base/test/scoped_fake_full_keyboard_access.h" 23 #include "ui/base/test/scoped_fake_full_keyboard_access.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // True if the about:blank tab should be opened when the browser is launched. 260 // True if the about:blank tab should be opened when the browser is launched.
260 bool open_about_blank_on_browser_launch_; 261 bool open_about_blank_on_browser_launch_;
261 262
262 // True if the accessibility test should run for a particular test case. 263 // True if the accessibility test should run for a particular test case.
263 // This is reset for every test case. 264 // This is reset for every test case.
264 bool run_accessibility_checks_for_test_case_; 265 bool run_accessibility_checks_for_test_case_;
265 266
266 // We use hardcoded quota settings to have a consistent testing environment. 267 // We use hardcoded quota settings to have a consistent testing environment.
267 storage::QuotaSettings quota_settings_; 268 storage::QuotaSettings quota_settings_;
268 269
270 base::test::ScopedFeatureList scoped_feature_list_;
271
269 #if defined(OS_MACOSX) 272 #if defined(OS_MACOSX)
270 base::mac::ScopedNSAutoreleasePool* autorelease_pool_; 273 base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
271 std::unique_ptr<ScopedBundleSwizzlerMac> bundle_swizzler_; 274 std::unique_ptr<ScopedBundleSwizzlerMac> bundle_swizzler_;
272 275
273 // Enable fake full keyboard access by default, so that tests don't depend on 276 // Enable fake full keyboard access by default, so that tests don't depend on
274 // system setting of the test machine. Also, this helps to make tests on Mac 277 // system setting of the test machine. Also, this helps to make tests on Mac
275 // more consistent with other platforms, where most views are focusable by 278 // more consistent with other platforms, where most views are focusable by
276 // default. 279 // default.
277 ui::test::ScopedFakeFullKeyboardAccess faked_full_keyboard_access_; 280 ui::test::ScopedFakeFullKeyboardAccess faked_full_keyboard_access_;
278 #endif // OS_MACOSX 281 #endif // OS_MACOSX
279 282
280 #if defined(OS_WIN) 283 #if defined(OS_WIN)
281 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_; 284 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_;
282 #endif 285 #endif
283 }; 286 };
284 287
285 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 288 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « chrome/common/chrome_features.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698