Implement two cloud reporting policies

ReportExtensionsAndPluginsData policy blocks extensions and plugins report.
ReportSafeBrowsingData policy blocks Safe browsing data report.

Bug: 898673
Change-Id: Id2e2446ee342d13c07dcc79f150aa4baaedcb5c8
Reviewed-on: https://chromium-review.googlesource.com/c/1313329Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604933}

chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc

@@ -189,25 +189,31 @@ GenerateChromeUserProfileReportRequest(const base::Value& profile_report,
     }
   }
 
-  if (!UpdateJSONEncodedStringEntry(profile_report, kExtensionData,
-                                    request->mutable_extension_data(), LIST) ||
-      !UpdateJSONEncodedStringEntry(profile_report, kPlugins,
-                                    request->mutable_plugins(), LIST)) {
-    return nullptr;
-  }
-
-  if (const base::Value* count =
-          profile_report.FindKey(kSafeBrowsingWarnings)) {
-    if (!count->is_int())
+  if (prefs->GetBoolean(
+          enterprise_reporting::kReportExtensionsAndPluginsData)) {
+    if (!UpdateJSONEncodedStringEntry(profile_report, kExtensionData,
+                                      request->mutable_extension_data(),
+                                      LIST) ||
+        !UpdateJSONEncodedStringEntry(profile_report, kPlugins,
+                                      request->mutable_plugins(), LIST)) {
       return nullptr;
-    request->set_safe_browsing_warnings(count->GetInt());
+    }
   }
 
-  if (const base::Value* count =
-          profile_report.FindKey(kSafeBrowsingWarningsClickThrough)) {
-    if (!count->is_int())
-      return nullptr;
-    request->set_safe_browsing_warnings_click_through(count->GetInt());
+  if (prefs->GetBoolean(enterprise_reporting::kReportSafeBrowsingData)) {
+    if (const base::Value* count =
+            profile_report.FindKey(kSafeBrowsingWarnings)) {
+      if (!count->is_int())
+        return nullptr;
+      request->set_safe_browsing_warnings(count->GetInt());
+    }
+
+    if (const base::Value* count =
+            profile_report.FindKey(kSafeBrowsingWarningsClickThrough)) {
+      if (!count->is_int())
+        return nullptr;
+      request->set_safe_browsing_warnings_click_through(count->GetInt());
+    }
   }
 
   return request;

chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper_unittest.cc

@@ -261,4 +261,49 @@ TEST_F(ChromeDesktopReportRequestGeneratorTest, DontReportUserIDData) {
   EXPECT_FALSE(profile.has_chrome_signed_in_user());
 }
 
+TEST_F(ChromeDesktopReportRequestGeneratorTest,
+       DontReportExtensionsOrPluginsData) {
+  PrefService* prefs = profile_.GetPrefs();
+  prefs->SetBoolean(enterprise_reporting::kReportExtensionsAndPluginsData,
+                    false);
+
+  std::unique_ptr<base::DictionaryValue> report =
+      base::DictionaryValue::From(base::JSONReader::Read(R"({"browserReport":
+                                  {"chromeUserProfileReport":[
+                                    {"extensionData": [{"id":"1"}],
+                                     "plugins": [{"id":"2"}]
+                                    }]}})"));
+  ASSERT_TRUE(report);
+  std::unique_ptr<em::ChromeDesktopReportRequest> request =
+      GenerateChromeDesktopReportRequest(*report, &profile_);
+  ASSERT_TRUE(request);
+  EXPECT_FALSE(request->browser_report()
+                   .chrome_user_profile_reports(0)
+                   .has_extension_data());
+  EXPECT_FALSE(
+      request->browser_report().chrome_user_profile_reports(0).has_plugins());
+}
+
+TEST_F(ChromeDesktopReportRequestGeneratorTest, DontReportSafeBrowsingData) {
+  PrefService* prefs = profile_.GetPrefs();
+  prefs->SetBoolean(enterprise_reporting::kReportSafeBrowsingData, false);
+
+  std::unique_ptr<base::DictionaryValue> report =
+      base::DictionaryValue::From(base::JSONReader::Read(R"({"browserReport":
+                                  {"chromeUserProfileReport":[
+                                    {"safeBrowsingWarnings" : 1,
+                                     "safeBrowsingWarningsClickThrough": 2
+                                    }]}})"));
+  ASSERT_TRUE(report);
+  std::unique_ptr<em::ChromeDesktopReportRequest> request =
+      GenerateChromeDesktopReportRequest(*report, &profile_);
+  ASSERT_TRUE(request);
+  EXPECT_FALSE(request->browser_report()
+                   .chrome_user_profile_reports(0)
+                   .has_safe_browsing_warnings());
+  EXPECT_FALSE(request->browser_report()
+                   .chrome_user_profile_reports(0)
+                   .has_safe_browsing_warnings_click_through());
+}
+
 }  // namespace extensions