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

Side by Side Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 6090006: Regkey functions return error code instead of bool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_frame/test/chrome_frame_test_utils.h" 5 #include "chrome_frame/test/chrome_frame_test_utils.h"
6 6
7 #include <atlapp.h> 7 #include <atlapp.h>
8 #include <atlmisc.h> 8 #include <atlmisc.h>
9 #include <iepmapi.h> 9 #include <iepmapi.h>
10 #include <sddl.h> 10 #include <sddl.h>
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 } 626 }
627 return NULL; 627 return NULL;
628 } 628 }
629 } 629 }
630 630
631 TempRegKeyOverride::TempRegKeyOverride(HKEY override, const wchar_t* temp_name) 631 TempRegKeyOverride::TempRegKeyOverride(HKEY override, const wchar_t* temp_name)
632 : override_(override), temp_name_(temp_name) { 632 : override_(override), temp_name_(temp_name) {
633 DCHECK(temp_name && lstrlenW(temp_name)); 633 DCHECK(temp_name && lstrlenW(temp_name));
634 std::wstring key_path(kTempTestKeyPath); 634 std::wstring key_path(kTempTestKeyPath);
635 key_path += L"\\" + temp_name_; 635 key_path += L"\\" + temp_name_;
636 EXPECT_TRUE(temp_key_.Create(HKEY_CURRENT_USER, key_path.c_str(), 636 EXPECT_EQ(ERROR_SUCCESS, temp_key_.Create(HKEY_CURRENT_USER, key_path.c_str(),
637 KEY_ALL_ACCESS)); 637 KEY_ALL_ACCESS));
638 EXPECT_EQ(ERROR_SUCCESS, 638 EXPECT_EQ(ERROR_SUCCESS,
639 ::RegOverridePredefKey(override_, temp_key_.Handle())); 639 ::RegOverridePredefKey(override_, temp_key_.Handle()));
640 } 640 }
641 641
642 TempRegKeyOverride::~TempRegKeyOverride() { 642 TempRegKeyOverride::~TempRegKeyOverride() {
643 ::RegOverridePredefKey(override_, NULL); 643 ::RegOverridePredefKey(override_, NULL);
644 // The temp key will be deleted via a call to DeleteAllTempKeys(). 644 // The temp key will be deleted via a call to DeleteAllTempKeys().
645 } 645 }
646 646
647 // static 647 // static
648 void TempRegKeyOverride::DeleteAllTempKeys() { 648 void TempRegKeyOverride::DeleteAllTempKeys() {
649 base::win::RegKey key; 649 base::win::RegKey key;
650 if (key.Open(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS)) { 650 if (key.Open(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS) == ERROR_SUCCESS) {
651 key.DeleteKey(kTempTestKeyPath); 651 key.DeleteKey(kTempTestKeyPath);
652 } 652 }
653 } 653 }
654 654
655 ScopedVirtualizeHklmAndHkcu::ScopedVirtualizeHklmAndHkcu() { 655 ScopedVirtualizeHklmAndHkcu::ScopedVirtualizeHklmAndHkcu() {
656 TempRegKeyOverride::DeleteAllTempKeys(); 656 TempRegKeyOverride::DeleteAllTempKeys();
657 hklm_.reset(new TempRegKeyOverride(HKEY_LOCAL_MACHINE, L"hklm_fake")); 657 hklm_.reset(new TempRegKeyOverride(HKEY_LOCAL_MACHINE, L"hklm_fake"));
658 hkcu_.reset(new TempRegKeyOverride(HKEY_CURRENT_USER, L"hkcu_fake")); 658 hkcu_.reset(new TempRegKeyOverride(HKEY_CURRENT_USER, L"hkcu_fake"));
659 } 659 }
660 660
661 ScopedVirtualizeHklmAndHkcu::~ScopedVirtualizeHklmAndHkcu() { 661 ScopedVirtualizeHklmAndHkcu::~ScopedVirtualizeHklmAndHkcu() {
662 hkcu_.reset(NULL); 662 hkcu_.reset(NULL);
663 hklm_.reset(NULL); 663 hklm_.reset(NULL);
664 TempRegKeyOverride::DeleteAllTempKeys(); 664 TempRegKeyOverride::DeleteAllTempKeys();
665 } 665 }
666 666
667 bool KillProcesses(const std::wstring& executable_name, int exit_code, 667 bool KillProcesses(const std::wstring& executable_name, int exit_code,
668 bool wait) { 668 bool wait) {
669 bool result = true; 669 bool result = true;
670 base::NamedProcessIterator iter(executable_name, NULL); 670 base::NamedProcessIterator iter(executable_name, NULL);
671 while (const base::ProcessEntry* entry = iter.NextProcessEntry()) { 671 while (const base::ProcessEntry* entry = iter.NextProcessEntry()) {
672 result &= base::KillProcessById(entry->pid(), exit_code, wait); 672 result &= base::KillProcessById(entry->pid(), exit_code, wait);
673 } 673 }
674 return result; 674 return result;
675 } 675 }
676 676
677 } // namespace chrome_frame_test 677 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/ready_mode/internal/registry_ready_mode_state.cc ('k') | chrome_frame/test/perf/chrome_frame_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698