Move serial number in cloud reporting

Serial number should be put at the top level of report as it doesn't belong
to any Browser or Profile instance.

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

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

@@ -82,11 +82,6 @@ void AppendAdditionalBrowserInformation(em::ChromeDesktopReportRequest* request,
                                         Profile* profile) {
   const PrefService* prefs = profile->GetPrefs();
 
-#if defined(OS_WIN)
-  request->mutable_browser_report()->set_serial_number(
-      policy::BrowserDMTokenStorage::Get()->RetrieveSerialNumber());
-#endif
-
   // Set Chrome version number
   request->mutable_browser_report()->set_browser_version(
       version_info::GetVersionNumber());
@@ -167,6 +162,11 @@ void AppendPlatformInformation(em::ChromeDesktopReportRequest* request,
   base::Value os_user = base::Value(base::Value::Type::DICTIONARY);
   os_user.SetKey(kUsername, base::Value(policy::GetOSUsername()));
   base::JSONWriter::Write(os_user, request->mutable_os_user());
+
+#if defined(OS_WIN)
+  request->set_serial_number(
+      policy::BrowserDMTokenStorage::Get()->RetrieveSerialNumber());
+#endif
 }
 
 std::unique_ptr<em::ChromeUserProfileReport>

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

@@ -253,9 +253,9 @@ TEST_F(ChromeDesktopReportRequestGeneratorTest, SerialNumberNotEmpty) {
       GenerateChromeDesktopReportRequest(base::DictionaryValue(), &profile_);
   ASSERT_TRUE(request);
 #if defined(OS_WIN)
-  EXPECT_NE(request->browser_report().serial_number(), std::string());
+  EXPECT_NE(request->serial_number(), std::string());
 #else
-  EXPECT_TRUE(request->browser_report().serial_number().empty());
+  EXPECT_TRUE(request->serial_number().empty());
 #endif
 }
 

components/policy/proto/device_management_backend.proto

@@ -951,10 +951,6 @@ message BrowserReport {
 
   // Profile specific reports, one per profile.
   repeated ChromeUserProfileReport chrome_user_profile_reports = 4;
-
-  // The device serial number (this might differ with the client ID, depending
-  // on the platform)
-  optional string serial_number = 5;
 }
 
 // Report the status of a Chrome installation on non-Chrome OS platform.
@@ -970,6 +966,9 @@ message ChromeDesktopReportRequest {
   optional string os_user = 3;
   // Browser related info.
   optional BrowserReport browser_report = 4;
+  // The device serial number (this might differ with the client ID, depending
+  // on the platform)
+  optional string serial_number = 5;
 }
 
 // A validation issue from validating a policy value that was contained in