Commit 1dd965b1 authored by Owen Min's avatar Owen Min Committed by Commit Bot

Delete unused enterprise reporting pref

Those prefs values are set by policies only. |kCloudReportingEnabled|
was moved to local_state a while ago while the other policies are never
launched.

Bug: 1107440
Change-Id: Ie0c9ff83ac4ef5e9f950a4d446c16f687fbffac5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2360570Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804431}
parent a5cee9f8
...@@ -1083,8 +1083,6 @@ static_library("extensions") { ...@@ -1083,8 +1083,6 @@ static_library("extensions") {
"api/enterprise_reporting_private/enterprise_reporting_private_api.h", "api/enterprise_reporting_private/enterprise_reporting_private_api.h",
"api/enterprise_reporting_private/keychain_data_helper_mac.h", "api/enterprise_reporting_private/keychain_data_helper_mac.h",
"api/enterprise_reporting_private/keychain_data_helper_mac.mm", "api/enterprise_reporting_private/keychain_data_helper_mac.mm",
"api/enterprise_reporting_private/prefs.cc",
"api/enterprise_reporting_private/prefs.h",
"api/image_writer_private/operation_nonchromeos.cc", "api/image_writer_private/operation_nonchromeos.cc",
"api/messaging/native_message_process_host.cc", "api/messaging/native_message_process_host.cc",
"api/messaging/native_message_process_host.h", "api/messaging/native_message_process_host.h",
......
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/enterprise_reporting_private/prefs.h"
#include "chrome/common/pref_names.h"
#include "components/enterprise/browser/reporting/common_pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
namespace extensions {
namespace enterprise_reporting {
const char kReportVersionData[] = "enterprise_reporting.report_version_data";
const char kReportPolicyData[] = "enterprise_reporting.report_policy_data";
const char kReportMachineIDData[] =
"enterprise_reporting.report_machine_id_data";
const char kReportUserIDData[] = "enterprise_reporting.report_user_id_data";
const char kReportExtensionsAndPluginsData[] =
"enterprise_reporting.report_extensions_and_plugins_data";
const char kReportSafeBrowsingData[] =
"enterprise_reporting.report_safe_browsing_data";
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(kReportVersionData, true);
registry->RegisterBooleanPref(kReportPolicyData, true);
registry->RegisterBooleanPref(kReportMachineIDData, true);
registry->RegisterBooleanPref(kReportUserIDData, true);
registry->RegisterBooleanPref(kReportExtensionsAndPluginsData, true);
registry->RegisterBooleanPref(kReportSafeBrowsingData, false);
registry->RegisterBooleanPref(::enterprise_reporting::kCloudReportingEnabled,
false);
}
} // namespace enterprise_reporting
} // namespace extensions
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_ENTERPRISE_REPORTING_PRIVATE_PREFS_H_
#define CHROME_BROWSER_EXTENSIONS_API_ENTERPRISE_REPORTING_PRIVATE_PREFS_H_
namespace user_prefs {
class PrefRegistrySyncable;
} // namespace user_prefs
namespace extensions {
namespace enterprise_reporting {
// Controls reporting of OS/Chrome version information.
extern const char kReportVersionData[];
// Controls reporting of Chrome policy data and policy fetch timestamps.
extern const char kReportPolicyData[];
// Controls reporting of information that can identify machines.
extern const char kReportMachineIDData[];
// Controls reporting of information that can identify users.
extern const char kReportUserIDData[];
// Controls reporting of Chrome extensions and plugins data.
extern const char kReportExtensionsAndPluginsData[];
// Controls reporting of Safe browsing data.
extern const char kReportSafeBrowsingData[];
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
} // namespace enterprise_reporting
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_ENTERPRISE_REPORTING_PRIVATE_PREFS_H_
...@@ -146,10 +146,6 @@ ...@@ -146,10 +146,6 @@
#include "extensions/common/manifest.h" #include "extensions/common/manifest.h"
#endif // BUILDFLAG(ENABLE_EXTENSIONS) #endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_CHROMEOS)
#include "chrome/browser/extensions/api/enterprise_reporting_private/prefs.h"
#endif // BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_CHROMEOS)
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
#include "chrome/browser/plugins/plugin_policy_handler.h" #include "chrome/browser/plugins/plugin_policy_handler.h"
#endif // BUILDFLAG(ENABLE_PLUGINS) #endif // BUILDFLAG(ENABLE_PLUGINS)
...@@ -1270,24 +1266,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { ...@@ -1270,24 +1266,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
#endif // BUILDFLAG(ENABLE_EXTENSIONS) #endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if !defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_EXTENSIONS) #if !defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_EXTENSIONS)
{ key::kReportVersionData,
extensions::enterprise_reporting::kReportVersionData,
base::Value::Type::BOOLEAN },
{ key::kReportPolicyData,
extensions::enterprise_reporting::kReportPolicyData,
base::Value::Type::BOOLEAN },
{ key::kReportMachineIDData,
extensions::enterprise_reporting::kReportMachineIDData,
base::Value::Type::BOOLEAN },
{ key::kReportUserIDData,
extensions::enterprise_reporting::kReportUserIDData,
base::Value::Type::BOOLEAN },
{ key::kReportExtensionsAndPluginsData,
extensions::enterprise_reporting::kReportExtensionsAndPluginsData,
base::Value::Type::BOOLEAN },
{ key::kReportSafeBrowsingData,
extensions::enterprise_reporting::kReportSafeBrowsingData,
base::Value::Type::BOOLEAN },
{ key::kBlockExternalExtensions, { key::kBlockExternalExtensions,
extensions::pref_names::kBlockExternalExtensions, extensions::pref_names::kBlockExternalExtensions,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
......
...@@ -185,8 +185,6 @@ ...@@ -185,8 +185,6 @@
#include "chrome/browser/chromeos/policy/system_proxy_manager.h" #include "chrome/browser/chromeos/policy/system_proxy_manager.h"
#include "chrome/browser/chromeos/settings/stats_reporting_controller.h" #include "chrome/browser/chromeos/settings/stats_reporting_controller.h"
#include "chrome/browser/component_updater/metadata_table_chromeos.h" #include "chrome/browser/component_updater/metadata_table_chromeos.h"
#else
#include "chrome/browser/extensions/api/enterprise_reporting_private/prefs.h"
#endif // defined(OS_CHROMEOS) #endif // defined(OS_CHROMEOS)
#endif // BUILDFLAG(ENABLE_EXTENSIONS) #endif // BUILDFLAG(ENABLE_EXTENSIONS)
...@@ -1132,10 +1130,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, ...@@ -1132,10 +1130,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
default_apps::RegisterProfilePrefs(registry); default_apps::RegisterProfilePrefs(registry);
#endif #endif
#if !defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_EXTENSIONS)
extensions::enterprise_reporting::RegisterProfilePrefs(registry);
#endif
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
accessibility_prefs::RegisterInvertBubbleUserPrefs(registry); accessibility_prefs::RegisterInvertBubbleUserPrefs(registry);
RegisterBrowserViewProfilePrefs(registry); RegisterBrowserViewProfilePrefs(registry);
......
...@@ -7300,65 +7300,15 @@ ...@@ -7300,65 +7300,15 @@
] ]
}, },
"ReportVersionData": { "ReportVersionData": {},
"os": ["win", "linux", "mac"],
"policy_pref_mapping_test": [
{
"policies": {
"ReportVersionData": false
},
"prefs": { "enterprise_reporting.report_version_data": {} }
}
]
},
"ReportPolicyData": { "ReportPolicyData": {},
"os": ["win", "linux", "mac"],
"policy_pref_mapping_test": [
{
"policies": {
"ReportPolicyData": false
},
"prefs": { "enterprise_reporting.report_policy_data": {} }
}
]
},
"ReportMachineIDData": { "ReportMachineIDData": {},
"os": ["win", "linux", "mac"],
"policy_pref_mapping_test": [
{
"policies": {
"ReportMachineIDData": false
},
"prefs": { "enterprise_reporting.report_machine_id_data": {} }
}
]
},
"ReportUserIDData": { "ReportUserIDData": {},
"os": ["win", "linux", "mac"],
"policy_pref_mapping_test": [
{
"policies": {
"ReportUserIDData": false
},
"prefs": { "enterprise_reporting.report_user_id_data": {} }
}
]
},
"ReportExtensionsAndPluginsData": { "ReportExtensionsAndPluginsData": {},
"os": ["win", "linux", "mac"],
"policy_pref_mapping_test": [
{
"policies": {
"ReportExtensionsAndPluginsData": false
},
"prefs": { "enterprise_reporting.report_extensions_and_plugins_data": {} }
}
]
},
"ReportSafeBrowsingData": { "ReportSafeBrowsingData": {
"note": "This policy has been removed. See https://bugs.chromium.org/p/chromium/issues/detail?id=1083085" "note": "This policy has been removed. See https://bugs.chromium.org/p/chromium/issues/detail?id=1083085"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment