Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc

Issue 1928013004: Add delayed retry to DeviceManagementService requests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits Created 4 years, 7 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/policy/affiliation_test_helper.h" 7 #include "chrome/browser/chromeos/policy/affiliation_test_helper.h"
8 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 8 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
9 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" 9 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
10 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h" 10 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/net/url_request_mock_util.h" 12 #include "chrome/browser/net/url_request_mock_util.h"
13 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "chromeos/dbus/fake_session_manager_client.h" 14 #include "chromeos/dbus/fake_session_manager_client.h"
15 #include "chromeos/login/user_names.h" 15 #include "chromeos/login/user_names.h"
16 #include "components/policy/core/common/cloud/device_management_service.h"
16 #include "components/policy/core/common/mock_configuration_policy_provider.h" 17 #include "components/policy/core/common/mock_configuration_policy_provider.h"
17 #include "components/prefs/pref_service.h" 18 #include "components/prefs/pref_service.h"
18 #include "components/signin/core/account_id/account_id.h" 19 #include "components/signin/core/account_id/account_id.h"
19 #include "components/user_manager/user_manager.h" 20 #include "components/user_manager/user_manager.h"
20 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
21 #include "content/public/test/test_utils.h" 22 #include "content/public/test/test_utils.h"
22 #include "extensions/browser/api_test_utils.h" 23 #include "extensions/browser/api_test_utils.h"
23 #include "extensions/browser/extension_registry.h" 24 #include "extensions/browser/extension_registry.h"
24 #include "extensions/browser/test_extension_registry_observer.h" 25 #include "extensions/browser/test_extension_registry_observer.h"
25 #include "extensions/test/result_catcher.h" 26 #include "extensions/test/result_catcher.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 112
112 fake_session_manager_client->set_device_policy(device_policy->GetBlob()); 113 fake_session_manager_client->set_device_policy(device_policy->GetBlob());
113 fake_session_manager_client->OnPropertyChangeComplete(true); 114 fake_session_manager_client->OnPropertyChangeComplete(true);
114 115
115 // Init the user policy provider. 116 // Init the user policy provider.
116 EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_)) 117 EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
117 .WillRepeatedly(testing::Return(true)); 118 .WillRepeatedly(testing::Return(true));
118 policy_provider_.SetAutoRefresh(); 119 policy_provider_.SetAutoRefresh();
119 policy::BrowserPolicyConnector::SetPolicyProviderForTesting( 120 policy::BrowserPolicyConnector::SetPolicyProviderForTesting(
120 &policy_provider_); 121 &policy_provider_);
122
123 // Set retry delay to prevent timeouts
cschuet (SLOW) 2016/05/13 15:20:22 nit "." at the end.
Marton Hunyady 2016/05/13 15:27:26 Done.
124 policy::DeviceManagementService::SetRetryDelayForTesting(0);
121 } 125 }
122 126
123 void SetUpOnMainThread() override { 127 void SetUpOnMainThread() override {
124 const base::ListValue* users = 128 const base::ListValue* users =
125 g_browser_process->local_state()->GetList("LoggedInUsers"); 129 g_browser_process->local_state()->GetList("LoggedInUsers");
126 if (!users->empty()) { 130 if (!users->empty()) {
127 policy::affiliation_test_helper::LoginUser( 131 policy::affiliation_test_helper::LoginUser(
128 affiliated_account_id_.GetUserEmail()); 132 affiliated_account_id_.GetUserEmail());
129 } 133 }
130 134
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 "'enterprise.deviceAttributes' is not allowed for specified install " 238 "'enterprise.deviceAttributes' is not allowed for specified install "
235 "location.", 239 "location.",
236 extension->install_warnings()[0].message); 240 extension->install_warnings()[0].message);
237 } 241 }
238 242
239 // Both cases of affiliated and non-affiliated on the device user are tested. 243 // Both cases of affiliated and non-affiliated on the device user are tested.
240 INSTANTIATE_TEST_CASE_P(AffiliationCheck, 244 INSTANTIATE_TEST_CASE_P(AffiliationCheck,
241 EnterpriseDeviceAttributesTest, 245 EnterpriseDeviceAttributesTest,
242 ::testing::Values(Params(true), Params(false))); 246 ::testing::Values(Params(true), Params(false)));
243 } // namespace extensions 247 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698