Fix cloud policy duplicate registrations issue.

chrome/browser/policy/cloud_policy_client_unittest.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 <map>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/policy/mock_cloud_policy_client.h"
 #include "chrome/browser/policy/mock_device_management_service.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using testing::Mock;
 using testing::Return;
 using testing::SaveArg;
 using testing::StrictMock;
 using testing::_;
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 namespace {
 
 const char kClientID[] = "fake-client-id";
 const char kMachineID[] = "fake-machine-id";
 const char kMachineModel[] = "fake-machine-model";
 const char kOAuthToken[] = "fake-oauth-token";
 const char kDMToken[] = "fake-dm-token";
 
-class MockObserver : public CloudPolicyClient::Observer {
- public:
-  MockObserver() {}
-  virtual ~MockObserver() {}
-
-  MOCK_METHOD1(OnPolicyFetched, void(CloudPolicyClient*));
-  MOCK_METHOD1(OnRegistrationStateChanged, void(CloudPolicyClient*));
-  MOCK_METHOD1(OnClientError, void(CloudPolicyClient*));
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MockObserver);
-};
-
 class MockStatusProvider : public CloudPolicyClient::StatusProvider {
  public:
   MockStatusProvider() {}
   virtual ~MockStatusProvider() {}
 
   MOCK_METHOD1(GetDeviceStatus, bool(em::DeviceStatusReportRequest* status));
   MOCK_METHOD1(GetSessionStatus, bool(em::SessionStatusReportRequest* status));
   MOCK_METHOD0(OnSubmittedSuccessfully, void(void));
 
  private:
@@ skipping 112 matching lines @@
 
   // Protobufs used in successful responses.
   em::DeviceManagementResponse registration_response_;
   em::DeviceManagementResponse policy_response_;
   em::DeviceManagementResponse unregistration_response_;
 
   std::string client_id_;
   PolicyNamespaceKey policy_ns_key_;
   MockDeviceManagementService service_;
   StrictMock<MockStatusProvider> status_provider_;
-  StrictMock<MockObserver> observer_;
+  StrictMock<MockCloudPolicyClientObserver> observer_;
   scoped_ptr<CloudPolicyClient> client_;
 };
 
 TEST_F(CloudPolicyClientTest, Init) {
   EXPECT_CALL(service_, CreateJob(_)).Times(0);
   EXPECT_FALSE(client_->is_registered());
   EXPECT_FALSE(client_->GetPolicyFor(policy_ns_key_));
 }
 
 TEST_F(CloudPolicyClientTest, SetupRegistrationAndPolicyFetch) {
@@ skipping 56 matching lines @@
       .WillOnce(service_.FailJob(DM_STATUS_REQUEST_FAILED));
   EXPECT_CALL(service_, StartJob(_, _, _, _, _, _, _));
   EXPECT_CALL(observer_, OnClientError(_));
   client_->Register(em::DeviceRegisterRequest::USER,
                     kOAuthToken, std::string(), false);
   EXPECT_FALSE(client_->is_registered());
   EXPECT_FALSE(client_->GetPolicyFor(policy_ns_key_));
   EXPECT_EQ(DM_STATUS_REQUEST_FAILED, client_->status());
 }
 
+TEST_F(CloudPolicyClientTest, RetryRegistration) {
+  // First registration does not set the re-register flag.
+  EXPECT_FALSE(
+      registration_request_.mutable_register_request()->has_reregister());
+  MockDeviceManagementJob* register_job = NULL;
+  EXPECT_CALL(service_,
+              CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION))
+      .WillOnce(service_.CreateAsyncJob(&register_job));
+  EXPECT_CALL(service_, StartJob(dm_protocol::kValueRequestRegister,
+                                 "", kOAuthToken, "", "", _,
+                                 MatchProto(registration_request_)));
+  client_->Register(em::DeviceRegisterRequest::USER,
+                    kOAuthToken, std::string(), false);
+  EXPECT_FALSE(client_->is_registered());
+  Mock::VerifyAndClearExpectations(&service_);
+
+  // Simulate a retry callback before proceeding; the re-register flag is set.
+  registration_request_.mutable_register_request()->set_reregister(true);
+  EXPECT_CALL(service_, StartJob(dm_protocol::kValueRequestRegister,
+                                 "", kOAuthToken, "", "", _,
+                                 MatchProto(registration_request_)));
+  register_job->RetryJob();
+  Mock::VerifyAndClearExpectations(&service_);
+
+  // Subsequent retries keep the flag set.
+  EXPECT_CALL(service_, StartJob(dm_protocol::kValueRequestRegister,
+                                 "", kOAuthToken, "", "", _,
+                                 MatchProto(registration_request_)));
+  register_job->RetryJob();
+  Mock::VerifyAndClearExpectations(&service_);
+}
+
 TEST_F(CloudPolicyClientTest, PolicyUpdate) {
   Register();
 
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
   EXPECT_CALL(status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   CheckPolicyResponse();
 
   policy_response_.mutable_policy_response()->clear_response();
@@ skipping 168 matching lines @@
   // Verify that the client got all the responses mapped to their namespaces.
   for (ResponseMap::iterator it = expected_responses.begin();
        it != expected_responses.end(); ++it) {
     const em::PolicyFetchResponse* response = client_->GetPolicyFor(it->first);
     ASSERT_TRUE(response);
     EXPECT_EQ(it->second.SerializeAsString(), response->SerializeAsString());
   }
 }
 
 }  // namespace policy