Merge server-side changes of the cloud policy protocol

chrome/browser/policy/device_management_service_unittest.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/policy/device_management_backend_impl.h"
 #include "chrome/browser/policy/device_management_backend_mock.h"
@@ skipping 291 matching lines @@
   em::DeviceManagementRequest expected_request_wrapper;
   expected_request_wrapper.mutable_register_request()->CopyFrom(request);
   std::string expected_request_data;
   ASSERT_TRUE(expected_request_wrapper.SerializeToString(
       &expected_request_data));
   EXPECT_EQ(expected_request_data, fetcher->upload_data());
 
   // Generate the response.
   std::string response_data;
   em::DeviceManagementResponse response_wrapper;
-  response_wrapper.set_error(em::DeviceManagementResponse::SUCCESS);
   response_wrapper.mutable_register_response()->CopyFrom(expected_response);
   ASSERT_TRUE(response_wrapper.SerializeToString(&response_data));
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   fetcher->delegate()->OnURLFetchComplete(fetcher,
                                           GURL(kServiceUrl),
                                           status,
                                           200,
                                           ResponseCookies(),
                                           response_data);
 }
@@ skipping 22 matching lines @@
   em::DeviceManagementRequest expected_request_wrapper;
   expected_request_wrapper.mutable_unregister_request()->CopyFrom(request);
   std::string expected_request_data;
   ASSERT_TRUE(expected_request_wrapper.SerializeToString(
       &expected_request_data));
   EXPECT_EQ(expected_request_data, fetcher->upload_data());
 
   // Generate the response.
   std::string response_data;
   em::DeviceManagementResponse response_wrapper;
-  response_wrapper.set_error(em::DeviceManagementResponse::SUCCESS);
   response_wrapper.mutable_unregister_response()->CopyFrom(expected_response);
   ASSERT_TRUE(response_wrapper.SerializeToString(&response_data));
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   fetcher->delegate()->OnURLFetchComplete(fetcher,
                                           GURL(kServiceUrl),
                                           status,
                                           200,
                                           ResponseCookies(),
                                           response_data);
 }
@@ skipping 55 matching lines @@
 
   // Now initialize the service. That should start the job.
   service_->Initialize(request_context_.get());
   fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   factory_.RemoveFetcherFromMap(0);
 
   // Check that the request is processed as expected.
   std::string response_data;
   em::DeviceManagementResponse response_wrapper;
-  response_wrapper.set_error(em::DeviceManagementResponse::SUCCESS);
   response_wrapper.mutable_register_response()->CopyFrom(expected_response);
   ASSERT_TRUE(response_wrapper.SerializeToString(&response_data));
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   fetcher->delegate()->OnURLFetchComplete(fetcher,
                                           GURL(kServiceUrl),
                                           status,
                                           200,
                                           ResponseCookies(),
                                           response_data);
 }
@@ skipping 35 matching lines @@
                                           status,
                                           500,
                                           ResponseCookies(),
                                           "");
 
   // Backend should have been reset.
   EXPECT_FALSE(backend_.get());
 }
 
 }  // namespace policy