chrome/browser/chromeos/login/supervised/supervised_user_test_base.h - Issue 409743003: Use content::RunBlockingPoolTask() in tests.

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_test_base.h

Issue 409743003: Use content::RunBlockingPoolTask() in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased + reverted changes to content/browser/media/webrtc_identity_store_unittest.cc. Created 6 years, 3 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_	4 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_

5 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_	5 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "chrome/browser/chromeos/login/login_manager_test.h"	10 #include "chrome/browser/chromeos/login/login_manager_test.h"

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85	85

86 void PrepareUsers();	86 void PrepareUsers();

87 void StartFlowLoginAsManager();	87 void StartFlowLoginAsManager();

88 void FillNewUserData(const std::string& display_name);	88 void FillNewUserData(const std::string& display_name);

89 void StartUserCreation(const std::string& button_id,	89 void StartUserCreation(const std::string& button_id,

90 const std::string& expected_display_name);	90 const std::string& expected_display_name);

91 void SigninAsSupervisedUser(bool check_homedir_calls,	91 void SigninAsSupervisedUser(bool check_homedir_calls,

92 int user_index,	92 int user_index,

93 const std::string& expected_display_name);	93 const std::string& expected_display_name);

94 void SigninAsManager(int user_index);	94 void SigninAsManager(int user_index);

95 void RemoveSupervisedUser(unsigned long original_user_count,	95 void RemoveSupervisedUser(uint32 original_user_count,
	sky 2014/09/08 15:51:37 Why this change? And if you're going to change thi Why this change? And if you're going to change this you should be using uint32_t. Lei Zhang 2014/09/08 18:21:01 re: uint32 vs uint32_t: https://code.google.com/p/ Show quoted text On 2014/09/08 15:51:37, sky wrote: > Why this change? And if you're going to change this you should be using > uint32_t. re: uint32 vs uint32_t: https://code.google.com/p/chromium/codesearch#chromium/src/base/basictypes.h&... mtomasz 2014/09/09 01:15:31 I did as git cl lint asked: chrome/browser/chrome Show quoted text On 2014/09/08 18:21:01, Lei Zhang wrote: > On 2014/09/08 15:51:37, sky wrote: > > Why this change? And if you're going to change this you should be using > > uint32_t. > > re: uint32 vs uint32_t: > https://code.google.com/p/chromium/codesearch#chromium/src/base/basictypes.h&... I did as git cl lint asked: chrome/browser/chromeos/login/supervised/supervised_user_test_base.h:95: Use int16/int64/etc, rather than the C type long [runtime/int] [4] Replaced with simple int.
96 int user_index,	96 int user_index,

97 const std::string& expected_display_name);	97 const std::string& expected_display_name);

98	98

99 cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;	99 cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;

100 cryptohome::MockHomedirMethods* mock_homedir_methods_;	100 cryptohome::MockHomedirMethods* mock_homedir_methods_;

101 NetworkPortalDetectorTestImpl* network_portal_detector_;	101 NetworkPortalDetectorTestImpl* network_portal_detector_;

102 SupervisedUserRegistrationUtilityStub* registration_utility_stub_;	102 SupervisedUserRegistrationUtilityStub* registration_utility_stub_;

103 scoped_ptr<ScopedTestingSupervisedUserRegistrationUtility> scoped_utility_;	103 scoped_ptr<ScopedTestingSupervisedUserRegistrationUtility> scoped_utility_;

104 scoped_ptr<SupervisedUsersSharedSettingsSyncTestAdapter>	104 scoped_ptr<SupervisedUsersSharedSettingsSyncTestAdapter>

105 shared_settings_adapter_;	105 shared_settings_adapter_;

106 scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_;	106 scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_;

107	107

108 private:	108 private:

109 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase);	109 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase);

110 };	110 };

111	111

112 } // namespace chromeos	112 } // namespace chromeos

113	113

114 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_	114 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_

OLD	NEW