Refactored device status uploading out of policy fetch infrastructure.

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

Index: components/policy/core/common/cloud/cloud_policy_client_unittest.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
index 97393cfc10353826ccf0e9eaa997cdc31bc68291..9b5e87433f7fbd740933a766d153d65196200cf0 100644
--- a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
@@ -41,19 +41,6 @@ const char kDeviceCertificate[] = "fake-device-certificate";
 const char kRequisition[] = "fake-requisition";
 const char kStateKey[] = "fake-state-key";
 
-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:
-  DISALLOW_COPY_AND_ASSIGN(MockStatusProvider);
-};
-
 MATCHER_P(MatchProto, expected, "matches protobuf") {
   return arg.SerializePartialAsString() == expected.SerializePartialAsString();
 }
@@ -101,10 +88,6 @@ class CloudPolicyClientTest : public testing::Test {
 
   virtual void SetUp() override {
     CreateClient(USER_AFFILIATION_NONE);
-    EXPECT_CALL(*status_provider_, GetDeviceStatus(_))
-        .WillRepeatedly(Return(false));
-    EXPECT_CALL(*status_provider_, GetSessionStatus(_))
-        .WillRepeatedly(Return(false));
   }
 
   virtual void TearDown() override {
@@ -127,10 +110,6 @@ class CloudPolicyClientTest : public testing::Test {
                                         user_affiliation,
                                         &service_,
                                         request_context_));
-    scoped_ptr<StrictMock<MockStatusProvider> > status_provider =
-        make_scoped_ptr(new StrictMock<MockStatusProvider>());
-    status_provider_ = status_provider.get();
-    client_->SetStatusProvider(status_provider.Pass());
     client_->AddPolicyTypeToFetch(policy_type_, std::string());
     client_->AddObserver(&observer_);
   }
@@ -210,8 +189,6 @@ class CloudPolicyClientTest : public testing::Test {
   std::string client_id_;
   std::string policy_type_;
   MockDeviceManagementService service_;
-  // Weak pointer to StatusProvider - actual object is owned by client_.
-  StrictMock<MockStatusProvider>* status_provider_;
   StrictMock<MockCloudPolicyClientObserver> observer_;
   StrictMock<MockUploadCertificateObserver> upload_certificate_observer_;
   scoped_ptr<CloudPolicyClient> client_;
@@ -235,7 +212,6 @@ TEST_F(CloudPolicyClientTest, SetupRegistrationAndPolicyFetch) {
 
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
   CheckPolicyResponse();
@@ -253,7 +229,6 @@ TEST_F(CloudPolicyClientTest, RegistrationAndPolicyFetch) {
 
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
   CheckPolicyResponse();
@@ -345,7 +320,6 @@ TEST_F(CloudPolicyClientTest, PolicyUpdate) {
 
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   CheckPolicyResponse();
 
@@ -354,7 +328,6 @@ TEST_F(CloudPolicyClientTest, PolicyUpdate) {
       CreatePolicyData("updated-fake-policy-data"));
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
   CheckPolicyResponse();
@@ -377,7 +350,6 @@ TEST_F(CloudPolicyClientTest, PolicyFetchWithMetaData) {
 
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   CheckPolicyResponse();
 }
@@ -395,7 +367,6 @@ TEST_F(CloudPolicyClientTest, PolicyFetchWithInvalidation) {
 
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   CheckPolicyResponse();
   EXPECT_EQ(12345, client_->fetched_invalidation_version());
@@ -410,7 +381,6 @@ TEST_F(CloudPolicyClientTest, PolicyFetchWithInvalidationNoPayload) {
 
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   CheckPolicyResponse();
   EXPECT_EQ(-12345, client_->fetched_invalidation_version());
@@ -432,7 +402,6 @@ TEST_F(CloudPolicyClientTest, BadPolicyResponse) {
       CreatePolicyData("excess-fake-policy-data"));
   ExpectPolicyFetch(kDMToken, dm_protocol::kValueUserAffiliationNone);
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->FetchPolicy();
   EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
   CheckPolicyResponse();
@@ -447,7 +416,6 @@ TEST_F(CloudPolicyClientTest, PolicyRequestFailure) {
       .WillOnce(service_.FailJob(DM_STATUS_REQUEST_FAILED));
   EXPECT_CALL(service_, StartJob(_, _, _, _, _, _, _));
   EXPECT_CALL(observer_, OnClientError(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully()).Times(0);
   client_->FetchPolicy();
   EXPECT_EQ(DM_STATUS_REQUEST_FAILED, client_->status());
   EXPECT_FALSE(client_->GetPolicyFor(policy_type_, std::string()));
@@ -534,7 +502,6 @@ TEST_F(CloudPolicyClientTest, PolicyFetchWithExtensionPolicy) {
                kDMToken, dm_protocol::kValueUserAffiliationNone, client_id_, _))
       .WillOnce(SaveArg<6>(&policy_request_));
   EXPECT_CALL(observer_, OnPolicyFetched(_));
-  EXPECT_CALL(*status_provider_, OnSubmittedSuccessfully());
   client_->AddPolicyTypeToFetch(dm_protocol::kChromeExtensionPolicyType,
                                 std::string());
   client_->FetchPolicy();