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

Side by Side Diff: components/safe_browsing_db/v4_feature_list.cc

Issue 2910843002: [Cleanup] Move all browsertests to use ScopedFeatureList to modify features
Patch Set: Ilya comments addressed 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "components/safe_browsing_db/v4_feature_list.h"
6
5 #include "base/feature_list.h" 7 #include "base/feature_list.h"
6 #include "components/safe_browsing_db/v4_feature_list.h" 8 #include "components/safe_browsing_db/features.h"
7 9
8 namespace safe_browsing { 10 namespace safe_browsing {
9 11
10 namespace V4FeatureList { 12 namespace V4FeatureList {
11 13
12 namespace { 14 namespace {
13 15
14 const base::Feature kLocalDatabaseManagerEnabled{ 16 const base::Feature kLocalDatabaseManagerEnabled{
15 "SafeBrowsingV4LocalDatabaseManagerEnabled", 17 "SafeBrowsingV4LocalDatabaseManagerEnabled",
16 base::FEATURE_DISABLED_BY_DEFAULT}; 18 base::FEATURE_DISABLED_BY_DEFAULT};
17 19
18 const base::Feature kV4OnlyEnabled{"SafeBrowsingV4OnlyEnabled",
19 base::FEATURE_DISABLED_BY_DEFAULT};
20
21 bool IsV4OnlyEnabled() { 20 bool IsV4OnlyEnabled() {
22 return base::FeatureList::IsEnabled(kV4OnlyEnabled); 21 return base::FeatureList::IsEnabled(features::kV4OnlyEnabled);
23 } 22 }
24 23
25 bool IsLocalDatabaseManagerEnabled() { 24 bool IsLocalDatabaseManagerEnabled() {
26 return base::FeatureList::IsEnabled(kLocalDatabaseManagerEnabled) || 25 return base::FeatureList::IsEnabled(kLocalDatabaseManagerEnabled) ||
27 IsV4OnlyEnabled(); 26 IsV4OnlyEnabled();
28 } 27 }
29 28
30 } // namespace 29 } // namespace
31 30
32 V4UsageStatus GetV4UsageStatus() { 31 V4UsageStatus GetV4UsageStatus() {
33 V4UsageStatus v4_usage_status; 32 V4UsageStatus v4_usage_status;
34 if (safe_browsing::V4FeatureList::IsV4OnlyEnabled()) { 33 if (safe_browsing::V4FeatureList::IsV4OnlyEnabled()) {
35 v4_usage_status = V4UsageStatus::V4_ONLY; 34 v4_usage_status = V4UsageStatus::V4_ONLY;
36 } else if (safe_browsing::V4FeatureList::IsLocalDatabaseManagerEnabled()) { 35 } else if (safe_browsing::V4FeatureList::IsLocalDatabaseManagerEnabled()) {
37 v4_usage_status = V4UsageStatus::V4_INSTANTIATED; 36 v4_usage_status = V4UsageStatus::V4_INSTANTIATED;
38 } else { 37 } else {
39 v4_usage_status = V4UsageStatus::V4_DISABLED; 38 v4_usage_status = V4UsageStatus::V4_DISABLED;
40 } 39 }
41 return v4_usage_status; 40 return v4_usage_status;
42 } 41 }
43 42
44 } // namespace V4FeatureList 43 } // namespace V4FeatureList
45 44
46 } // namespace safe_browsing 45 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698