Fix dictionary merge in RealtimeReportingJobConfiguration::AddReport().

When merging report context, make sure to handle the the new context as
a dictionary and make sure to merge sub keys.

Bug: 1002764
Change-Id: I5216de7ce5cbf45f08ce75bfe2b1a9290c59628c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1797547Reviewed-by: Owen Min <zmin@chromium.org>
Commit-Queue: Roger Tawa <rogerta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695739}

components/policy/core/common/cloud/cloud_policy_client_unittest.cc

@@ -1465,10 +1465,10 @@ TEST_F(CloudPolicyClientTest, UploadRealtimeReport) {
                  base::Unretained(&callback_observer_));
 
   base::Value context(base::Value::Type::DICTIONARY);
-  context.SetStringPath("gaiaEmail", "name@gmail.com");
-  context.SetStringPath("userAgent", "User-Agent");
-  context.SetStringPath("profileName", "Profile 1");
-  context.SetStringPath("profilePath", "C:\\User Data\\Profile 1");
+  context.SetStringPath("profile.gaiaEmail", "name@gmail.com");
+  context.SetStringPath("browser.userAgent", "User-Agent");
+  context.SetStringPath("profile.profileName", "Profile 1");
+  context.SetStringPath("profile.profilePath", "C:\\User Data\\Profile 1");
 
   base::Value event;
   event.SetStringPath("time", "2019-05-22T13:01:45Z");
@@ -1512,6 +1512,80 @@ TEST_F(CloudPolicyClientTest, UploadRealtimeReport) {
   base::span<const base::Value> list = events->GetList();
   EXPECT_EQ(1u, list.size());
 }
+
+TEST_F(CloudPolicyClientTest, RealtimeReportMerge) {
+  auto config = std::make_unique<RealtimeReportingJobConfiguration>(
+      client_.get(), DMAuth::FromDMToken(kDMToken),
+      RealtimeReportingJobConfiguration::Callback());
+
+  // Add one report to the config.
+  {
+    base::Value context(base::Value::Type::DICTIONARY);
+    context.SetStringPath("profile.gaiaEmail", "name@gmail.com");
+    context.SetStringPath("browser.userAgent", "User-Agent");
+    context.SetStringPath("profile.profileName", "Profile 1");
+    context.SetStringPath("profile.profilePath", "C:\\User Data\\Profile 1");
+
+    base::Value event;
+    event.SetStringPath("time", "2019-09-10T20:01:45Z");
+    event.SetStringPath("foo.prop1", "value1");
+    event.SetStringPath("foo.prop2", "value2");
+    event.SetStringPath("foo.prop3", "value3");
+
+    base::Value events(base::Value::Type::LIST);
+    events.GetList().push_back(std::move(event));
+
+    base::Value report(base::Value::Type::DICTIONARY);
+    report.SetPath(RealtimeReportingJobConfiguration::kEventListKey,
+                   std::move(events));
+    report.SetPath(RealtimeReportingJobConfiguration::kContextKey,
+                   std::move(context));
+
+    ASSERT_TRUE(config->AddReport(std::move(report)));
+  }
+
+  // Add a second report to the config with a different context.
+  {
+    base::Value context(base::Value::Type::DICTIONARY);
+    context.SetStringPath("profile.gaiaEmail", "name2@gmail.com");
+    context.SetStringPath("browser.userAgent", "User-Agent2");
+    context.SetStringPath("browser.version", "1.0.0.0");
+
+    base::Value event;
+    event.SetStringPath("time", "2019-09-10T20:02:45Z");
+    event.SetStringPath("foo.prop1", "value1");
+    event.SetStringPath("foo.prop2", "value2");
+    event.SetStringPath("foo.prop3", "value3");
+
+    base::Value events(base::Value::Type::LIST);
+    events.GetList().push_back(std::move(event));
+
+    base::Value report(base::Value::Type::DICTIONARY);
+    report.SetPath(RealtimeReportingJobConfiguration::kEventListKey,
+                   std::move(events));
+    report.SetPath(RealtimeReportingJobConfiguration::kContextKey,
+                   std::move(context));
+
+    ASSERT_TRUE(config->AddReport(std::move(report)));
+  }
+
+  // The second config should trump the first.
+  DeviceManagementService::JobConfiguration* job_config = config.get();
+  base::Optional<base::Value> payload =
+      base::JSONReader::Read(job_config->GetPayload());
+  ASSERT_TRUE(payload);
+
+  ASSERT_EQ("name2@gmail.com", *payload->FindStringPath("profile.gaiaEmail"));
+  ASSERT_EQ("User-Agent2", *payload->FindStringPath("browser.userAgent"));
+  ASSERT_EQ("Profile 1", *payload->FindStringPath("profile.profileName"));
+  ASSERT_EQ("C:\\User Data\\Profile 1",
+            *payload->FindStringPath("profile.profilePath"));
+  ASSERT_EQ("1.0.0.0", *payload->FindStringPath("browser.version"));
+  ASSERT_EQ(2u,
+            payload->FindListPath(RealtimeReportingJobConfiguration::kEventsKey)
+                ->GetList()
+                .size());
+}
 #endif
 
 TEST_F(CloudPolicyClientTest, MultipleActiveRequests) {

components/policy/core/common/cloud/realtime_reporting_job_configuration.cc

@@ -73,12 +73,8 @@ bool RealtimeReportingJobConfiguration::AddReport(base::Value report) {
     return false;
 
   // Move context keys to the payload.  It is possible to add multiple reports
-  // to the payload in which case the context values are the same.  Only add
-  // any new values not already present.
-  for (const auto& item : context->DictItems()) {
-    if (!payload_.FindKey(item.first))
-      payload_.SetKey(item.first, item.second.Clone());
-  }
+  // to the payload in which case the context values are the same.
+  payload_.MergeDictionary(&*context);
 
   // Append event_list to the payload.
   base::Value::ListStorage& to = payload_.FindListKey(kEventsKey)->GetList();