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

Side by Side Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 2910843002: [Cleanup] Move all browsertests to use ScopedFeatureList to modify features
Patch Set: rebase update Created 3 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include <queue> 5 #include <queue>
6 #include <set> 6 #include <set>
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 3605 matching lines...) Expand 10 before | Expand all | Expand 10 after
3616 if (use_cross_process_frames_for_guests) { 3616 if (use_cross_process_frames_for_guests) {
3617 scoped_feature_list_.InitAndEnableFeature( 3617 scoped_feature_list_.InitAndEnableFeature(
3618 features::kGuestViewCrossProcessFrames); 3618 features::kGuestViewCrossProcessFrames);
3619 } else { 3619 } else {
3620 scoped_feature_list_.InitAndDisableFeature( 3620 scoped_feature_list_.InitAndDisableFeature(
3621 features::kGuestViewCrossProcessFrames); 3621 features::kGuestViewCrossProcessFrames);
3622 } 3622 }
3623 } 3623 }
3624 3624
3625 private: 3625 private:
3626 base::test::ScopedFeatureList scoped_feature_list_;
3626 DISALLOW_COPY_AND_ASSIGN(WebViewGuestScrollTest); 3627 DISALLOW_COPY_AND_ASSIGN(WebViewGuestScrollTest);
3627
3628 base::test::ScopedFeatureList scoped_feature_list_;
Ilya Sherman 2017/06/12 21:50:29 This change seems unrelated. Could you please spl
chaopeng 2017/06/28 19:21:22 Removed
3629 }; 3628 };
3630 3629
3631 class WebViewGuestScrollTouchTest : public WebViewGuestScrollTest { 3630 class WebViewGuestScrollTouchTest : public WebViewGuestScrollTest {
3632 protected: 3631 protected:
3633 void SetUpCommandLine(base::CommandLine* command_line) override { 3632 void SetUpCommandLine(base::CommandLine* command_line) override {
3634 WebViewGuestScrollTest::SetUpCommandLine(command_line); 3633 WebViewGuestScrollTest::SetUpCommandLine(command_line);
3635 3634
3636 command_line->AppendSwitchASCII( 3635 command_line->AppendSwitchASCII(
3637 switches::kTouchEventFeatureDetection, 3636 switches::kTouchEventFeatureDetection,
3638 switches::kTouchEventFeatureDetectionEnabled); 3637 switches::kTouchEventFeatureDetectionEnabled);
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
4185 ClosingChromeSignInShouldNotCrash) { 4184 ClosingChromeSignInShouldNotCrash) {
4186 GURL signin_url{"chrome://chrome-signin"}; 4185 GURL signin_url{"chrome://chrome-signin"};
4187 4186
4188 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); 4187 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED);
4189 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); 4188 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED);
4190 WaitForWebViewInDom(); 4189 WaitForWebViewInDom();
4191 4190
4192 chrome::CloseTab(browser()); 4191 chrome::CloseTab(browser());
4193 } 4192 }
4194 #endif 4193 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698