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

Unified Diff: chrome_frame/test/dll_redirector_test.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/chrome_frame_ui_test_utils.cc ('k') | chrome_frame/test/header_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/dll_redirector_test.cc
diff --git a/chrome_frame/test/dll_redirector_test.cc b/chrome_frame/test/dll_redirector_test.cc
index 22310944ea28f2a2d34545faf6d360a56e091476..853235a6851e0a492699aded5ed45dc7c3507e7c 100644
--- a/chrome_frame/test/dll_redirector_test.cc
+++ b/chrome_frame/test/dll_redirector_test.cc
@@ -242,7 +242,7 @@ DWORD WINAPI LockSquattingThread(void* in_params) {
DCHECK(params);
// Grab the lock for the shared memory region and hold onto it.
- base::SharedMemory squatter(ASCIIToWide(kTestVersionBeaconName));
+ base::SharedMemory squatter(base::ASCIIToWide(kTestVersionBeaconName));
base::SharedMemoryAutoLock squatter_lock(&squatter);
// Notify our caller that we're squatting.
@@ -318,7 +318,7 @@ TEST_F(DllRedirectorTest, LowIntegrityAccess) {
// Ensure that we can acquire the mutex from medium integrity:
{
- base::SharedMemory shared_memory(ASCIIToWide(kTestVersionBeaconName));
+ base::SharedMemory shared_memory(base::ASCIIToWide(kTestVersionBeaconName));
bool mutex_locked = shared_memory.Lock(kWaitTestTimeout, NULL);
EXPECT_TRUE(mutex_locked);
@@ -338,7 +338,7 @@ TEST_F(DllRedirectorTest, LowIntegrityAccess) {
ASSERT_TRUE(low_integrity_token.Impersonate());
// Ensure that we can also acquire the mutex from low integrity.
- base::SharedMemory shared_memory(ASCIIToWide(kTestVersionBeaconName));
+ base::SharedMemory shared_memory(base::ASCIIToWide(kTestVersionBeaconName));
bool mutex_locked = shared_memory.Lock(kWaitTestTimeout, NULL);
EXPECT_TRUE(mutex_locked);
@@ -362,7 +362,7 @@ TEST_F(DllRedirectorTest, LowIntegrityAccessDenied) {
// Ensure that we can acquire the mutex from medium integrity:
{
- base::SharedMemory shared_memory(ASCIIToWide(kTestVersionBeaconName));
+ base::SharedMemory shared_memory(base::ASCIIToWide(kTestVersionBeaconName));
bool mutex_locked = shared_memory.Lock(kWaitTestTimeout, NULL);
EXPECT_TRUE(mutex_locked);
@@ -381,7 +381,7 @@ TEST_F(DllRedirectorTest, LowIntegrityAccessDenied) {
// Ensure that we can't acquire the mutex without having set the
// Low Integrity ACE in the SACL.
- base::SharedMemory shared_memory(ASCIIToWide(kTestVersionBeaconName));
+ base::SharedMemory shared_memory(base::ASCIIToWide(kTestVersionBeaconName));
bool mutex_locked = shared_memory.Lock(kWaitTestTimeout, NULL);
EXPECT_FALSE(mutex_locked);
« no previous file with comments | « chrome_frame/test/chrome_frame_ui_test_utils.cc ('k') | chrome_frame/test/header_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698