diff options
| author | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 21:22:16 +0000 |
|---|---|---|
| committer | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 21:22:16 +0000 |
| commit | 9ad73d3329c079312520e13cc35f370323e08fcd (patch) | |
| tree | b13f8fa7aab118439063ac22fa29eddd572a8d6b /chrome/browser/policy/device_management_service_unittest.cc | |
| parent | 8f1ac0819eeb9bc803637cfd5185a1cff4111234 (diff) | |
| download | chromium_src-9ad73d3329c079312520e13cc35f370323e08fcd.zip chromium_src-9ad73d3329c079312520e13cc35f370323e08fcd.tar.gz chromium_src-9ad73d3329c079312520e13cc35f370323e08fcd.tar.bz2 | |
Merge server-side changes of the cloud policy protocol
BUG=none
TEST=Chrome still compiles
Review URL: http://codereview.chromium.org/6880031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/device_management_service_unittest.cc')
| -rw-r--r-- | chrome/browser/policy/device_management_service_unittest.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc index 00a6f17..51a3065 100644 --- a/chrome/browser/policy/device_management_service_unittest.cc +++ b/chrome/browser/policy/device_management_service_unittest.cc @@ -309,7 +309,6 @@ TEST_F(DeviceManagementServiceTest, RegisterRequest) { // 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); @@ -352,7 +351,6 @@ TEST_F(DeviceManagementServiceTest, UnregisterRequest) { // 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); @@ -428,7 +426,6 @@ TEST_F(DeviceManagementServiceTest, JobQueueing) { // 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); |