3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/chromedriver/keycode_text_conversion_mac.mm b/chrome/test/chromedriver/keycode_text_conversion_mac.mm
index 4b02ace..d83df65 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_mac.mm
+++ b/chrome/test/chromedriver/keycode_text_conversion_mac.mm
@@ -44,7 +44,7 @@ bool ConvertKeyCodeToText(
   // on UCKeyTranslate for more info.
   UInt32 modifier_key_state = (mac_modifiers >> 8) & 0xFF;
 
-  base::mac::ScopedCFTypeRef<TISInputSourceRef> input_source_copy(
+  base::ScopedCFTypeRef<TISInputSourceRef> input_source_copy(
       TISCopyCurrentKeyboardLayoutInputSource());
   CFDataRef layout_data = static_cast<CFDataRef>(TISGetInputSourceProperty(
       input_source_copy, kTISPropertyUnicodeKeyLayoutData));
diff --git a/chrome/test/chromedriver/test_util.cc b/chrome/test/chromedriver/test_util.cc
index 4d2d3c6..14f1c74 100644
--- a/chrome/test/chromedriver/test_util.cc
+++ b/chrome/test/chromedriver/test_util.cc
@@ -39,15 +39,15 @@ bool SwitchKeyboardLayout(const std::string& input_locale_identifier) {
 
 #if defined(OS_MACOSX)
 bool SwitchKeyboardLayout(const std::string& input_source_id) {
-  base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> filter_dict(
+  base::ScopedCFTypeRef<CFMutableDictionaryRef> filter_dict(
       CFDictionaryCreateMutable(kCFAllocatorDefault,
                                 1,
                                 &kCFTypeDictionaryKeyCallBacks,
                                 &kCFTypeDictionaryValueCallBacks));
-  base::mac::ScopedCFTypeRef<CFStringRef> id_ref(CFStringCreateWithCString(
+  base::ScopedCFTypeRef<CFStringRef> id_ref(CFStringCreateWithCString(
       kCFAllocatorDefault, input_source_id.c_str(), kCFStringEncodingUTF8));
   CFDictionaryAddValue(filter_dict, kTISPropertyInputSourceID, id_ref);
-  base::mac::ScopedCFTypeRef<CFArrayRef> sources(
+  base::ScopedCFTypeRef<CFArrayRef> sources(
       TISCreateInputSourceList(filter_dict, true));
   if (CFArrayGetCount(sources) != 1)
     return false;
diff --git a/chrome/test/chromedriver/test_util.h b/chrome/test/chromedriver/test_util.h
index 6ef821e..e198842 100644
--- a/chrome/test/chromedriver/test_util.h
+++ b/chrome/test/chromedriver/test_util.h
@@ -27,7 +27,7 @@ class RestoreKeyboardLayoutOnDestruct {
 #if defined(OS_WIN)
   HKL layout_;
 #elif defined(OS_MACOSX)
-  base::mac::ScopedCFTypeRef<TISInputSourceRef> layout_;
+  base::ScopedCFTypeRef<TISInputSourceRef> layout_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(RestoreKeyboardLayoutOnDestruct);