| Index: chrome/browser/policy/device_token_fetcher_unittest.cc
|
| diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc
|
| index 2fb305ec1b33edea88c8928ace51be23bc6eb8a4..c6343e197bf845ef1682bf5f1721539496c8f16a 100644
|
| --- a/chrome/browser/policy/device_token_fetcher_unittest.cc
|
| +++ b/chrome/browser/policy/device_token_fetcher_unittest.cc
|
| @@ -9,10 +9,10 @@
|
| #include "base/message_loop.h"
|
| #include "chrome/browser/net/gaia/token_service.h"
|
| #include "chrome/browser/policy/device_management_service.h"
|
| -#include "chrome/browser/policy/proto/device_management_backend.pb.h"
|
| #include "chrome/browser/policy/mock_device_management_backend.h"
|
| #include "chrome/browser/policy/mock_device_management_service.h"
|
| #include "chrome/browser/policy/policy_notifier.h"
|
| +#include "chrome/browser/policy/proto/device_management_backend.pb.h"
|
| #include "chrome/browser/policy/user_policy_cache.h"
|
| #include "chrome/common/net/gaia/gaia_constants.h"
|
| #include "chrome/test/testing_profile.h"
|
| @@ -78,7 +78,8 @@ TEST_F(DeviceTokenFetcherTest, FetchToken) {
|
| fetcher.AddObserver(&observer);
|
| EXPECT_EQ("", fetcher.GetDeviceToken());
|
| fetcher.FetchToken("fake_auth_token", "fake_device_id",
|
| - em::DeviceRegisterRequest::USER, "fake_machine_id");
|
| + em::DeviceRegisterRequest::USER,
|
| + "fake_machine_id", "fake_machine_model");
|
| loop_.RunAllPending();
|
| Mock::VerifyAndClearExpectations(&observer);
|
| std::string token = fetcher.GetDeviceToken();
|
| @@ -89,7 +90,8 @@ TEST_F(DeviceTokenFetcherTest, FetchToken) {
|
| MockDeviceManagementBackendSucceedRegister());
|
| EXPECT_CALL(observer, OnDeviceTokenAvailable());
|
| fetcher.FetchToken("fake_auth_token", "fake_device_id",
|
| - em::DeviceRegisterRequest::USER, "fake_machine_id");
|
| + em::DeviceRegisterRequest::USER,
|
| + "fake_machine_id", "fake_machine_model");
|
| loop_.RunAllPending();
|
| Mock::VerifyAndClearExpectations(&observer);
|
| std::string token2 = fetcher.GetDeviceToken();
|
| @@ -109,7 +111,8 @@ TEST_F(DeviceTokenFetcherTest, RetryOnError) {
|
| EXPECT_CALL(observer, OnDeviceTokenAvailable());
|
| fetcher.AddObserver(&observer);
|
| fetcher.FetchToken("fake_auth_token", "fake_device_id",
|
| - em::DeviceRegisterRequest::USER, "fake_machine_id");
|
| + em::DeviceRegisterRequest::USER,
|
| + "fake_machine_id", "fake_machine_model");
|
| loop_.RunAllPending();
|
| Mock::VerifyAndClearExpectations(&observer);
|
| EXPECT_NE("", fetcher.GetDeviceToken());
|
| @@ -126,7 +129,8 @@ TEST_F(DeviceTokenFetcherTest, UnmanagedDevice) {
|
| EXPECT_CALL(observer, OnDeviceTokenAvailable()).Times(0);
|
| fetcher.AddObserver(&observer);
|
| fetcher.FetchToken("fake_auth_token", "fake_device_id",
|
| - em::DeviceRegisterRequest::USER, "fake_machine_id");
|
| + em::DeviceRegisterRequest::USER,
|
| + "fake_machine_id", "fake_machine_model");
|
| loop_.RunAllPending();
|
| Mock::VerifyAndClearExpectations(&observer);
|
| EXPECT_EQ("", fetcher.GetDeviceToken());
|
|
|