| Index: components/safe_browsing_db/v4_feature_list.cc
|
| diff --git a/components/safe_browsing_db/v4_feature_list.cc b/components/safe_browsing_db/v4_feature_list.cc
|
| index 9d166e9f15ba360e530f599772d55fc5d5622ad3..8185e6fc16d5785e0e030059d8e6bebbdbf07806 100644
|
| --- a/components/safe_browsing_db/v4_feature_list.cc
|
| +++ b/components/safe_browsing_db/v4_feature_list.cc
|
| @@ -2,22 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/feature_list.h"
|
| #include "components/safe_browsing_db/v4_feature_list.h"
|
|
|
| +#include "base/feature_list.h"
|
| +#include "components/safe_browsing/features.h"
|
| +
|
| namespace safe_browsing {
|
|
|
| namespace V4FeatureList {
|
|
|
| -namespace {
|
| -
|
| -const base::Feature kLocalDatabaseManagerEnabled{
|
| - "SafeBrowsingV4LocalDatabaseManagerEnabled",
|
| - base::FEATURE_DISABLED_BY_DEFAULT};
|
| -
|
| -const base::Feature kV4OnlyEnabled{"SafeBrowsingV4OnlyEnabled",
|
| - base::FEATURE_DISABLED_BY_DEFAULT};
|
| -
|
| bool IsV4OnlyEnabled() {
|
| return base::FeatureList::IsEnabled(kV4OnlyEnabled);
|
| }
|
| @@ -27,8 +20,6 @@ bool IsLocalDatabaseManagerEnabled() {
|
| IsV4OnlyEnabled();
|
| }
|
|
|
| -} // namespace
|
| -
|
| V4UsageStatus GetV4UsageStatus() {
|
| V4UsageStatus v4_usage_status;
|
| if (safe_browsing::V4FeatureList::IsV4OnlyEnabled()) {
|
|
|