Generate profile report with extension requests only.

Extension request only report only contains
- profile id
- extension request.
But not
- extension list
- policies info

Profile name and sign in user info only added on CrOS.

Bug: 1137964
Change-Id: I76bc72acde86f149ac090d839d159ddb56b6bb6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485276Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Reviewed-by: Owen Min <zmin@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819442}

chrome/browser/enterprise/reporting/profile_report_generator_unittest.cc

@@ -265,4 +265,41 @@ TEST_F(ProfileReportGeneratorTest, TooManyRequests) {
               report2->extension_requests(id).id());
 }
 
+TEST_F(ProfileReportGeneratorTest, ExtensionRequestOnlyReport) {
+  profile()->GetTestingPrefService()->SetManagedPref(
+      prefs::kCloudExtensionRequestEnabled,
+      std::make_unique<base::Value>(true));
+  std::vector<std::string> ids = {kExtensionId};
+  SetExtensionToPendingList(ids);
+
+  IdentityTestEnvironmentProfileAdaptor identity_test_env_adaptor(profile());
+  auto expected_info =
+      identity_test_env_adaptor.identity_test_env()->SetPrimaryAccount(
+          "test@mail.com");
+
+  auto report = generator_.MaybeGenerate(profile()->GetPath(),
+                                         profile()->GetProfileUserName(),
+                                         ReportType::kExtensionRequest);
+
+  // Extension request and profile id are included. Profile name and sign in
+  // users info are included on CrOS only.
+  EXPECT_TRUE(report);
+  EXPECT_EQ(profile()->GetPath().AsUTF8Unsafe(), report->id());
+#if defined(OS_CHROMEOS)
+  EXPECT_EQ(profile()->GetProfileUserName(), report->name());
+  EXPECT_TRUE(report->has_chrome_signed_in_user());
+#else
+  EXPECT_FALSE(report->has_name());
+  EXPECT_FALSE(report->has_chrome_signed_in_user());
+#endif
+  ASSERT_EQ(1, report->extension_requests_size());
+  EXPECT_EQ(kExtensionId, report->extension_requests(0).id());
+  EXPECT_EQ(kFakeTime, report->extension_requests(0).request_timestamp());
+
+  // Policies and extensions info should not be added.
+  EXPECT_EQ(0, report->chrome_policies_size());
+  EXPECT_EQ(0, report->extensions_size());
+  EXPECT_EQ(0, report->policy_fetched_timestamps_size());
+}
+
 }  // namespace enterprise_reporting

components/enterprise/BUILD.gn

@@ -34,6 +34,7 @@ static_library("enterprise") {
       "browser/reporting/report_request_queue_generator.h",
       "browser/reporting/report_scheduler.cc",
       "browser/reporting/report_scheduler.h",
+      "browser/reporting/report_type.h",
       "browser/reporting/report_uploader.cc",
       "browser/reporting/report_uploader.h",
       "browser/reporting/reporting_delegate_factory.h",

components/enterprise/browser/reporting/profile_report_generator.cc

@@ -31,32 +31,44 @@ void ProfileReportGenerator::set_policies_enabled(bool enabled) {
 
 std::unique_ptr<em::ChromeUserProfileInfo>
 ProfileReportGenerator::MaybeGenerate(const base::FilePath& path,
-                                      const std::string& name) {
+                                      const std::string& name,
+                                      ReportType report_type) {
   if (!delegate_->Init(path)) {
     return nullptr;
   }
 
   report_ = std::make_unique<em::ChromeUserProfileInfo>();
   report_->set_id(path.AsUTF8Unsafe());
-  report_->set_name(name);
-  report_->set_is_full_report(true);
 
-  delegate_->GetSigninUserInfo(report_.get());
-  if (extensions_enabled_) {
-    delegate_->GetExtensionInfo(report_.get());
-  }
-  delegate_->GetExtensionRequest(report_.get());
-
-  if (policies_enabled_) {
-    // TODO(crbug.com/983151): Upload policy error as their IDs.
-    auto client = delegate_->MakePolicyConversionsClient();
-    policies_ = policy::DictionaryPolicyConversions(std::move(client))
-                    .EnableConvertTypes(false)
-                    .EnablePrettyPrint(false)
-                    .ToValue();
-    GetChromePolicyInfo();
-    GetExtensionPolicyInfo();
-    GetPolicyFetchTimestampInfo();
+  if (report_type == ReportType::kExtensionRequest) {
+#if defined(OS_CHROMEOS)
+    // Extension request is aggregated at the user level on CrOS.
+    report_->set_name(name);
+    delegate_->GetSigninUserInfo(report_.get());
+#endif  // defined(OS_CHROMEOS)
+    delegate_->GetExtensionRequest(report_.get());
+
+  } else {
+    report_->set_name(name);
+    report_->set_is_full_report(true);
+
+    delegate_->GetSigninUserInfo(report_.get());
+    if (extensions_enabled_) {
+      delegate_->GetExtensionInfo(report_.get());
+    }
+    delegate_->GetExtensionRequest(report_.get());
+
+    if (policies_enabled_) {
+      // TODO(crbug.com/983151): Upload policy error as their IDs.
+      auto client = delegate_->MakePolicyConversionsClient();
+      policies_ = policy::DictionaryPolicyConversions(std::move(client))
+                      .EnableConvertTypes(false)
+                      .EnablePrettyPrint(false)
+                      .ToValue();
+      GetChromePolicyInfo();
+      GetExtensionPolicyInfo();
+      GetPolicyFetchTimestampInfo();
+    }
   }
 
   return std::move(report_);

components/enterprise/browser/reporting/profile_report_generator.h

@@ -9,6 +9,8 @@
 #include <string>
 
 #include "base/values.h"
+#include "components/enterprise/browser/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_type.h"
 #include "components/policy/core/browser/policy_conversions_client.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 
@@ -72,7 +74,8 @@ class ProfileReportGenerator {
   // generated.
   std::unique_ptr<enterprise_management::ChromeUserProfileInfo> MaybeGenerate(
       const base::FilePath& path,
-      const std::string& name);
+      const std::string& name,
+      ReportType report_type = ReportType::kFull);
 
  protected:
   void GetChromePolicyInfo();

components/enterprise/browser/reporting/report_type.h

+// Copyright 2020 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 COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_TYPE_H_
+#define COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_TYPE_H_
+
+namespace enterprise_reporting {
+
+enum ReportType : uint32_t {
+  kFull = 0,
+  kBrowserVersion = 1u << 0,
+  kExtensionRequest = 2u << 1,
+};
+
+}  // namespace enterprise_reporting
+
+#endif  // COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_TYPE_H_