Fix cloud policy duplicate registrations issue.

chrome/browser/policy/cloud_policy_client.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/policy/cloud_policy_client.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 92 matching lines @@
   if (!client_id.empty())
     request->set_reregister(true);
   request->set_type(type);
   if (!machine_id_.empty())
     request->set_machine_id(machine_id_);
   if (!machine_model_.empty())
     request->set_machine_model(machine_model_);
   if (is_auto_enrollement)
     request->set_auto_enrolled(true);
 
+  request_job_->SetRetryCallback(
+      base::Bind(&CloudPolicyClient::OnRetryRegister, base::Unretained(this)));
+
   request_job_->Start(base::Bind(&CloudPolicyClient::OnRegisterCompleted,
                                  base::Unretained(this)));
 }
 
 void CloudPolicyClient::FetchPolicy() {
   CHECK(is_registered());
 
   request_job_.reset(
       service_->CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH));
   request_job_->SetDMToken(dm_token_);
@@ skipping 71 matching lines @@
 void CloudPolicyClient::RemoveNamespaceToFetch(const PolicyNamespaceKey& key) {
   namespaces_to_fetch_.erase(key);
 }
 
 const em::PolicyFetchResponse* CloudPolicyClient::GetPolicyFor(
     const PolicyNamespaceKey& key) const {
   ResponseMap::const_iterator it = responses_.find(key);
   return it == responses_.end() ? NULL : it->second;
 }
 
+void CloudPolicyClient::OnRetryRegister(DeviceManagementRequestJob* job) {
+  DCHECK_EQ(request_job_.get(), job);
+  // If the initial request managed to get to the server but the response didn't
+  // arrive to the client then retrying with the same device-id will fail.

[Mattias Nissler (ping if slow), 2013/02/11 11:30:37]

nit: s/to/at/

[Mattias Nissler (ping if slow), 2013/02/11 11:30:37]

nit: s/device-id/client ID/ (for consistency with the file)

[Joao da Silva, 2013/02/11 17:38:19]

Done.

[Joao da Silva, 2013/02/11 17:38:19]

Done.

+  // Set the re-registration flag so that the server accepts it.
+  // If the server hasn't seen the device-id before then it will also accept

[Mattias Nissler (ping if slow), 2013/02/11 11:30:37]

ditto

[Joao da Silva, 2013/02/11 17:38:19]

Done.

+  // the re-registration.
+  job->GetRequest()->mutable_register_request()->set_reregister(true);
+}
+
 void CloudPolicyClient::OnRegisterCompleted(
     DeviceManagementStatus status,
     const em::DeviceManagementResponse& response) {
   if (status == DM_STATUS_SUCCESS &&
       (!response.has_register_response() ||
        !response.register_response().has_device_management_token())) {
     LOG(WARNING) << "Invalid registration response.";
     status = DM_STATUS_RESPONSE_DECODING_ERROR;
   }
 
@@ skipping 83 matching lines @@
 
 void CloudPolicyClient::NotifyRegistrationStateChanged() {
   FOR_EACH_OBSERVER(Observer, observers_, OnRegistrationStateChanged(this));
 }
 
 void CloudPolicyClient::NotifyClientError() {
   FOR_EACH_OBSERVER(Observer, observers_, OnClientError(this));
 }
 
 }  // namespace policy