chrome/browser/policy/device_management_service_browsertest.cc - Issue 5162006: Always send the device ID when making device management requests.

Unified Diff: chrome/browser/policy/device_management_service_browsertest.cc

Issue 5162006: Always send the device ID when making device management requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/policy/device_management_policy_provider_unittest.cc ('k') | chrome/browser/policy/device_management_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/device_management_service_browsertest.cc

diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc

index b7205b5e22503c5507a95933b30f77789299cae8..70a8e1bd09c0d052b5a19c92224fd1bf6b6d6eb0 100644

--- a/chrome/browser/policy/device_management_service_browsertest.cc

+++ b/chrome/browser/policy/device_management_service_browsertest.cc

@@ -103,7 +103,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,

::CaptureToken),

InvokeWithoutArgs(QuitMessageLoop)));

em::DeviceRegisterRequest request;

- backend->ProcessRegisterRequest("token", "device id", request, &delegate);

+ backend->ProcessRegisterRequest("token", "testid", request, &delegate);

MessageLoop::current()->Run();

}

@@ -118,7 +118,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,

em::DevicePolicySettingRequest* setting_request =

request.add_setting_request();

setting_request->set_key("policy");

- backend->ProcessPolicyRequest(token_, request, &delegate);

+ backend->ProcessPolicyRequest(token_, "testid", request, &delegate);

MessageLoop::current()->Run();

}

@@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,

EXPECT_CALL(delegate, HandleUnregisterResponse(_))

.WillOnce(InvokeWithoutArgs(QuitMessageLoop));

em::DeviceUnregisterRequest request;

- backend->ProcessUnregisterRequest(token_, request, &delegate);

+ backend->ProcessUnregisterRequest(token_, "testid", request, &delegate);

MessageLoop::current()->Run();

}

@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,

::CaptureToken),

InvokeWithoutArgs(QuitMessageLoop)));

em::DeviceRegisterRequest request;

- backend->ProcessRegisterRequest("token", "device id", request, &delegate);

+ backend->ProcessRegisterRequest("token", "testid", request, &delegate);

MessageLoop::current()->Run();

}

@@ -169,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,

em::DevicePolicySettingRequest* setting_request =

request.add_setting_request();

setting_request->set_key("policy");

- backend->ProcessPolicyRequest(token_, request, &delegate);

+ backend->ProcessPolicyRequest(token_, "testid", request, &delegate);

MessageLoop::current()->Run();

}

@@ -179,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,

EXPECT_CALL(delegate, HandleUnregisterResponse(_))

.WillOnce(InvokeWithoutArgs(QuitMessageLoop));

em::DeviceUnregisterRequest request;

- backend->ProcessUnregisterRequest(token_, request, &delegate);

+ backend->ProcessUnregisterRequest(token_, "testid", request, &delegate);

MessageLoop::current()->Run();

}