| Index: chrome/browser/google/google_update_win_unittest.cc
|
| diff --git a/chrome/browser/google/google_update_win_unittest.cc b/chrome/browser/google/google_update_win_unittest.cc
|
| index 033fa73b88e415a17d97e21258f67fc7a6f3d333..88161759cc2a2e18bc40c2a8fcf29499b344f844 100644
|
| --- a/chrome/browser/google/google_update_win_unittest.cc
|
| +++ b/chrome/browser/google/google_update_win_unittest.cc
|
| @@ -595,6 +595,8 @@ class GoogleUpdateWinTest : public ::testing::TestWithParam<bool> {
|
| current_version.components()[1],
|
| current_version.components()[2] + 1,
|
| current_version.components()[3]);
|
| +
|
| + SetUpdateDriverTaskRunnerForTesting(task_runner_);
|
| }
|
|
|
| // Creates app bundle and app mocks that will be used to simulate Google
|
| @@ -672,7 +674,7 @@ TEST_P(GoogleUpdateWinTest, InvalidInstallDirectory) {
|
|
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnError(CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY, _, _));
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -686,7 +688,7 @@ TEST_P(GoogleUpdateWinTest, NoGoogleUpdateForCheck) {
|
| // Expect the appropriate error when the on-demand class cannot be created.
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnError(GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND, _, _));
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -699,7 +701,7 @@ TEST_P(GoogleUpdateWinTest, NoGoogleUpdateForUpgrade) {
|
| // Expect the appropriate error when the on-demand class cannot be created.
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnError(GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND, _, _));
|
| - BeginUpdateCheck(task_runner_, std::string(), true, 0,
|
| + BeginUpdateCheck(std::string(), true, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -716,7 +718,7 @@ TEST_P(GoogleUpdateWinTest, FailUpdateCheck) {
|
|
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnError(GOOGLE_UPDATE_ONDEMAND_CLASS_REPORTED_ERROR, _, _));
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -741,7 +743,7 @@ TEST_P(GoogleUpdateWinTest, UpdatesDisabledByPolicy) {
|
|
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnError(GOOGLE_UPDATE_DISABLED_BY_POLICY, _, _));
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -767,7 +769,7 @@ TEST_P(GoogleUpdateWinTest, ManualUpdatesDisabledByPolicy) {
|
|
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnError(GOOGLE_UPDATE_DISABLED_BY_POLICY_AUTO_ONLY, _, _));
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -788,7 +790,7 @@ TEST_P(GoogleUpdateWinTest, UpdateCheckNoUpdate) {
|
|
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnUpdateCheckComplete(IsEmpty())); // new_version
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -809,7 +811,7 @@ TEST_P(GoogleUpdateWinTest, UpdateCheckUpdateAvailable) {
|
|
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnUpdateCheckComplete(StrEq(new_version_)));
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -854,7 +856,7 @@ TEST_P(GoogleUpdateWinTest, UpdateInstalled) {
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnUpgradeComplete(StrEq(new_version_)));
|
| }
|
| - BeginUpdateCheck(task_runner_, std::string(), true, 0,
|
| + BeginUpdateCheck(std::string(), true, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -905,7 +907,7 @@ TEST_P(GoogleUpdateWinTest, UpdateFailed) {
|
| OnError(GOOGLE_UPDATE_ERROR_UPDATING, HasSubstr(error),
|
| StrEq(new_version_)));
|
| }
|
| - BeginUpdateCheck(task_runner_, std::string(), true, 0,
|
| + BeginUpdateCheck(std::string(), true, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -946,7 +948,7 @@ TEST_P(GoogleUpdateWinTest, RetryAfterExternalUpdaterError) {
|
| // Expect the update check to succeed.
|
| EXPECT_CALL(mock_update_check_delegate_,
|
| OnUpdateCheckComplete(IsEmpty())); // new_version
|
| - BeginUpdateCheck(task_runner_, std::string(), false, 0,
|
| + BeginUpdateCheck(std::string(), false, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
| @@ -1006,9 +1008,9 @@ TEST_P(GoogleUpdateWinTest, UpdateInstalledMultipleDelegates) {
|
| EXPECT_CALL(mock_update_check_delegate_2,
|
| OnUpgradeComplete(StrEq(new_version_)));
|
| }
|
| - BeginUpdateCheck(task_runner_, std::string(), true, 0,
|
| + BeginUpdateCheck(std::string(), true, 0,
|
| mock_update_check_delegate_.AsWeakPtr());
|
| - BeginUpdateCheck(task_runner_, std::string(), true, 0,
|
| + BeginUpdateCheck(std::string(), true, 0,
|
| mock_update_check_delegate_2.AsWeakPtr());
|
| task_runner_->RunUntilIdle();
|
| }
|
|
|