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

Side by Side Diff: chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc

Issue 2957983002: Remove pointless InProcessBrowserTest calls. (Closed)
Patch Set: build 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h" 5 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/test/scoped_feature_list.h" 10 #include "base/test/scoped_feature_list.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 LONG result = 72 LONG result =
73 base::win::RegKey(HKEY_CURRENT_USER, cleaner_key_path.c_str(), 73 base::win::RegKey(HKEY_CURRENT_USER, cleaner_key_path.c_str(),
74 KEY_SET_VALUE) 74 KEY_SET_VALUE)
75 .WriteValue(chrome_cleaner::kCleanupCompletedValueName, value); 75 .WriteValue(chrome_cleaner::kCleanupCompletedValueName, value);
76 ASSERT_EQ(ERROR_SUCCESS, result); 76 ASSERT_EQ(ERROR_SUCCESS, result);
77 } 77 }
78 78
79 class ChromeCleanerTagForResettingTest : public InProcessBrowserTest { 79 class ChromeCleanerTagForResettingTest : public InProcessBrowserTest {
80 public: 80 public:
81 void SetUpInProcessBrowserTestFixture() override { 81 void SetUpInProcessBrowserTestFixture() override {
82 InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
83
84 scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); 82 scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature);
85 } 83 }
86 84
87 protected: 85 protected:
88 base::test::ScopedFeatureList scoped_feature_list_; 86 base::test::ScopedFeatureList scoped_feature_list_;
89 }; 87 };
90 88
91 IN_PROC_BROWSER_TEST_F(ChromeCleanerTagForResettingTest, Run) { 89 IN_PROC_BROWSER_TEST_F(ChromeCleanerTagForResettingTest, Run) {
92 Browser* browser = chrome::FindLastActive(); 90 Browser* browser = chrome::FindLastActive();
93 ASSERT_TRUE(browser); 91 ASSERT_TRUE(browser);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 }; 143 };
146 144
147 // Param for this test: 145 // Param for this test:
148 // - CleanupCompletionState completion_state: indicates the value to be 146 // - CleanupCompletionState completion_state: indicates the value to be
149 // written to the registry for cleanup completion. 147 // written to the registry for cleanup completion.
150 class ChromeCleanerResetTaggedProfilesTest 148 class ChromeCleanerResetTaggedProfilesTest
151 : public InProcessBrowserTest, 149 : public InProcessBrowserTest,
152 public ::testing::WithParamInterface<CleanupCompletionState> { 150 public ::testing::WithParamInterface<CleanupCompletionState> {
153 public: 151 public:
154 void SetUpInProcessBrowserTestFixture() override { 152 void SetUpInProcessBrowserTestFixture() override {
155 InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
156
157 completion_state_ = GetParam(); 153 completion_state_ = GetParam();
158 ASSERT_TRUE(completion_state_ >= CleanupCompletionState::kNotAvailable && 154 ASSERT_TRUE(completion_state_ >= CleanupCompletionState::kNotAvailable &&
159 completion_state_ <= CleanupCompletionState::kInvalidValue); 155 completion_state_ <= CleanupCompletionState::kInvalidValue);
160 scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); 156 scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature);
161 } 157 }
162 158
163 protected: 159 protected:
164 CleanupCompletionState completion_state_; 160 CleanupCompletionState completion_state_;
165 161
166 base::test::ScopedFeatureList scoped_feature_list_; 162 base::test::ScopedFeatureList scoped_feature_list_;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 215
220 INSTANTIATE_TEST_CASE_P(Default, 216 INSTANTIATE_TEST_CASE_P(Default,
221 ChromeCleanerResetTaggedProfilesTest, 217 ChromeCleanerResetTaggedProfilesTest,
222 testing::Values(CleanupCompletionState::kNotAvailable, 218 testing::Values(CleanupCompletionState::kNotAvailable,
223 CleanupCompletionState::kNotCompleted, 219 CleanupCompletionState::kNotCompleted,
224 CleanupCompletionState::kCompleted, 220 CleanupCompletionState::kCompleted,
225 CleanupCompletionState::kInvalidValue)); 221 CleanupCompletionState::kInvalidValue));
226 222
227 } // namespace 223 } // namespace
228 } // namespace safe_browsing 224 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698