Merge 254685 "Fixed handling of 'oem_device_requisition' VPD value."

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc	(revision 255205)
+++ chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc	(working copy)
@@ -247,9 +247,14 @@
     const std::string& requisition) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
+  std::string initial_requisition =
+      connector->GetDeviceCloudPolicyManager()->GetDeviceRequisition();
   connector->GetDeviceCloudPolicyManager()->SetDeviceRequisition(requisition);
   // Exit Chrome to force the restart as soon as a new requisition is set.
-  chrome::AttemptRestart();
+  if (initial_requisition !=
+          connector->GetDeviceCloudPolicyManager()->GetDeviceRequisition()) {
+    chrome::AttemptRestart();
+  }
 }
 
 void CoreOobeHandler::HandleScreenAssetsLoaded(