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 | 4 |
5 #include "chrome/browser/google/google_update_win.h" | 5 #include "chrome/browser/google/google_update_win.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 #include <atlbase.h> | 8 #include <atlbase.h> |
9 #include <atlcom.h> | 9 #include <atlcom.h> |
10 | 10 |
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 program_files_override_.reset( | 553 program_files_override_.reset( |
554 new base::ScopedPathOverride(base::DIR_PROGRAM_FILES, temp)); | 554 new base::ScopedPathOverride(base::DIR_PROGRAM_FILES, temp)); |
555 PathService::Get(base::DIR_PROGRAM_FILESX86, &temp); | 555 PathService::Get(base::DIR_PROGRAM_FILESX86, &temp); |
556 program_files_x86_override_.reset( | 556 program_files_x86_override_.reset( |
557 new base::ScopedPathOverride(base::DIR_PROGRAM_FILESX86, temp)); | 557 new base::ScopedPathOverride(base::DIR_PROGRAM_FILESX86, temp)); |
558 PathService::Get(base::DIR_LOCAL_APP_DATA, &temp); | 558 PathService::Get(base::DIR_LOCAL_APP_DATA, &temp); |
559 local_app_data_override_.reset( | 559 local_app_data_override_.reset( |
560 new base::ScopedPathOverride(base::DIR_LOCAL_APP_DATA, temp)); | 560 new base::ScopedPathOverride(base::DIR_LOCAL_APP_DATA, temp)); |
561 | 561 |
562 // Override the registry so that tests can freely push state to it. | 562 // Override the registry so that tests can freely push state to it. |
563 registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER); | 563 ASSERT_NO_FATAL_FAILURE( |
564 registry_override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE); | 564 registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER)); |
| 565 ASSERT_NO_FATAL_FAILURE( |
| 566 registry_override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE)); |
565 | 567 |
566 // Chrome is installed. | 568 // Chrome is installed. |
567 const HKEY root = | 569 const HKEY root = |
568 system_level_install_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; | 570 system_level_install_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
569 base::win::RegKey key(root, kClients, KEY_WRITE | KEY_WOW64_32KEY); | 571 base::win::RegKey key(root, kClients, KEY_WRITE | KEY_WOW64_32KEY); |
570 ASSERT_EQ(ERROR_SUCCESS, | 572 ASSERT_EQ(ERROR_SUCCESS, |
571 key.CreateKey(kChromeGuid, KEY_WRITE | KEY_WOW64_32KEY)); | 573 key.CreateKey(kChromeGuid, KEY_WRITE | KEY_WOW64_32KEY)); |
572 ASSERT_EQ(ERROR_SUCCESS, | 574 ASSERT_EQ(ERROR_SUCCESS, |
573 key.WriteValue( | 575 key.WriteValue( |
574 L"pv", base::ASCIIToUTF16(CHROME_VERSION_STRING).c_str())); | 576 L"pv", base::ASCIIToUTF16(CHROME_VERSION_STRING).c_str())); |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1005 BeginUpdateCheck(task_runner_, std::string(), true, 0, | 1007 BeginUpdateCheck(task_runner_, std::string(), true, 0, |
1006 mock_update_check_delegate_.AsWeakPtr()); | 1008 mock_update_check_delegate_.AsWeakPtr()); |
1007 BeginUpdateCheck(task_runner_, std::string(), true, 0, | 1009 BeginUpdateCheck(task_runner_, std::string(), true, 0, |
1008 mock_update_check_delegate_2.AsWeakPtr()); | 1010 mock_update_check_delegate_2.AsWeakPtr()); |
1009 task_runner_->RunUntilIdle(); | 1011 task_runner_->RunUntilIdle(); |
1010 } | 1012 } |
1011 | 1013 |
1012 INSTANTIATE_TEST_CASE_P(UserLevel, GoogleUpdateWinTest, Values(false)); | 1014 INSTANTIATE_TEST_CASE_P(UserLevel, GoogleUpdateWinTest, Values(false)); |
1013 | 1015 |
1014 INSTANTIATE_TEST_CASE_P(SystemLevel, GoogleUpdateWinTest, Values(true)); | 1016 INSTANTIATE_TEST_CASE_P(SystemLevel, GoogleUpdateWinTest, Values(true)); |
OLD | NEW |