6 files changed, 15 insertions, 17 deletions
diff --git a/remoting/host/curtain_mode_mac.cc b/remoting/host/curtain_mode_mac.cc
index b68ab11..aa85156 100644
--- a/remoting/host/curtain_mode_mac.cc
+++ b/remoting/host/curtain_mode_mac.cc
@@ -134,7 +134,7 @@ void SessionWatcher::ActivateCurtain() {
     return;
   }
 
-  base::mac::ScopedCFTypeRef<CFDictionaryRef> session(
+  base::ScopedCFTypeRef<CFDictionaryRef> session(
       CGSessionCopyCurrentDictionary());
 
   // CGSessionCopyCurrentDictionary has been observed to return NULL in some
diff --git a/remoting/host/desktop_resizer_mac.cc b/remoting/host/desktop_resizer_mac.cc
index d1d6c2c..22cc67e 100644
--- a/remoting/host/desktop_resizer_mac.cc
+++ b/remoting/host/desktop_resizer_mac.cc
@@ -31,7 +31,7 @@ class DesktopResizerMac : public DesktopResizer {
   bool GetSoleDisplayId(CGDirectDisplayID* display);
 
   void GetSupportedModesAndSizes(
-      base::mac::ScopedCFTypeRef<CFMutableArrayRef>* modes,
+      base::ScopedCFTypeRef<CFMutableArrayRef>* modes,
       std::list<SkISize>* sizes);
 
   DISALLOW_COPY_AND_ASSIGN(DesktopResizerMac);
@@ -50,7 +50,7 @@ SkISize DesktopResizerMac::GetCurrentSize() {
 
 std::list<SkISize> DesktopResizerMac::GetSupportedSizes(
     const SkISize& preferred) {
-  base::mac::ScopedCFTypeRef<CFMutableArrayRef> modes;
+  base::ScopedCFTypeRef<CFMutableArrayRef> modes;
   std::list<SkISize> sizes;
   GetSupportedModesAndSizes(&modes, &sizes);
   return sizes;
@@ -62,7 +62,7 @@ void DesktopResizerMac::SetSize(const SkISize& size) {
     return;
   }
 
-  base::mac::ScopedCFTypeRef<CFMutableArrayRef> modes;
+  base::ScopedCFTypeRef<CFMutableArrayRef> modes;
   std::list<SkISize> sizes;
   GetSupportedModesAndSizes(&modes, &sizes);
   // There may be many modes with the requested size. Pick the one with the
@@ -76,7 +76,7 @@ void DesktopResizerMac::SetSize(const SkISize& size) {
           static_cast<const CGDisplayMode*>(
               CFArrayGetValueAtIndex(modes, index)));
       int depth = 0;
-      base::mac::ScopedCFTypeRef<CFStringRef> encoding(
+      base::ScopedCFTypeRef<CFStringRef> encoding(
           CGDisplayModeCopyPixelEncoding(mode));
       if (CFStringCompare(encoding, CFSTR(IO32BitDirectPixels),
                           kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
@@ -108,12 +108,12 @@ void DesktopResizerMac::RestoreSize(const SkISize& original) {
 }
 
 void DesktopResizerMac::GetSupportedModesAndSizes(
-    base::mac::ScopedCFTypeRef<CFMutableArrayRef>* modes,
+    base::ScopedCFTypeRef<CFMutableArrayRef>* modes,
     std::list<SkISize>* sizes) {
   CGDirectDisplayID display;
   if (GetSoleDisplayId(&display)) {
-    base::mac::ScopedCFTypeRef<CFArrayRef>
-        all_modes(CGDisplayCopyAllDisplayModes(display, NULL));
+    base::ScopedCFTypeRef<CFArrayRef> all_modes(
+        CGDisplayCopyAllDisplayModes(display, NULL));
     modes->reset(CFArrayCreateMutableCopy(NULL, 0, all_modes));
     CFIndex count = CFArrayGetCount(*modes);
     for (CFIndex i = 0; i < count; ++i) {
diff --git a/remoting/host/input_injector_mac.cc b/remoting/host/input_injector_mac.cc
index 0fc0379..fe7d80a 100644
--- a/remoting/host/input_injector_mac.cc
+++ b/remoting/host/input_injector_mac.cc
@@ -251,9 +251,8 @@ void InputInjectorMac::Core::InjectMouseEvent(const MouseEvent& event) {
   if (event.has_wheel_delta_x() && event.has_wheel_delta_y()) {
     int delta_x = static_cast<int>(event.wheel_delta_x());
     int delta_y = static_cast<int>(event.wheel_delta_y());
-    base::mac::ScopedCFTypeRef<CGEventRef> event(
-        CGEventCreateScrollWheelEvent(
-            NULL, kCGScrollEventUnitPixel, 2, delta_y, delta_x));
+    base::ScopedCFTypeRef<CGEventRef> event(CGEventCreateScrollWheelEvent(
+        NULL, kCGScrollEventUnitPixel, 2, delta_y, delta_x));
     if (event)
       CGEventPost(kCGSessionEventTap, event);
   }
diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm
index f38489a..3144ca8 100644
--- a/remoting/host/local_input_monitor_mac.mm
+++ b/remoting/host/local_input_monitor_mac.mm
@@ -60,7 +60,7 @@ class LocalInputMonitorMac : public base::NonThreadSafe,
  @private
   GTMCarbonHotKey* hotKey_;
   CFRunLoopSourceRef mouseRunLoopSource_;
-  base::mac::ScopedCFTypeRef<CFMachPortRef> mouseMachPort_;
+  base::ScopedCFTypeRef<CFMachPortRef> mouseMachPort_;
   remoting::LocalInputMonitorMac::EventHandler* monitor_;
 }
 
diff --git a/remoting/host/policy_hack/policy_watcher_mac.mm b/remoting/host/policy_hack/policy_watcher_mac.mm
index 82cc219..64e7ab0 100644
--- a/remoting/host/policy_hack/policy_watcher_mac.mm
+++ b/remoting/host/policy_hack/policy_watcher_mac.mm
@@ -48,7 +48,7 @@ class PolicyWatcherMac : public PolicyWatcher {
       for (base::DictionaryValue::Iterator i(Defaults());
            !i.IsAtEnd(); i.Advance()) {
         const std::string& policy_name = i.key();
-        base::mac::ScopedCFTypeRef<CFStringRef> policy_key(
+        base::ScopedCFTypeRef<CFStringRef> policy_key(
             base::SysUTF8ToCFStringRef(policy_name));
 
         if (i.value().GetType() == base::DictionaryValue::TYPE_BOOLEAN) {
@@ -62,7 +62,7 @@ class PolicyWatcherMac : public PolicyWatcher {
         }
 
         if (i.value().GetType() == base::DictionaryValue::TYPE_STRING) {
-          base::mac::ScopedCFTypeRef<CFPropertyListRef> property_list(
+          base::ScopedCFTypeRef<CFPropertyListRef> property_list(
               CFPreferencesCopyAppValue(policy_key, policy_bundle_id));
           if (property_list.get() != NULL) {
             CFStringRef policy_value = base::mac::CFCast<CFStringRef>(
diff --git a/remoting/host/setup/daemon_controller_mac.mm b/remoting/host/setup/daemon_controller_mac.mm
index 91773be..1c5a8b18 100644
--- a/remoting/host/setup/daemon_controller_mac.mm
+++ b/remoting/host/setup/daemon_controller_mac.mm
@@ -299,9 +299,8 @@ bool DaemonControllerMac::DoShowPreferencePane(const std::string& config_data) {
 
   CFNotificationCenterRef center =
       CFNotificationCenterGetDistributedCenter();
-  base::mac::ScopedCFTypeRef<CFStringRef> service_name(
-        CFStringCreateWithCString(kCFAllocatorDefault, remoting::kServiceName,
-                                  kCFStringEncodingUTF8));
+  base::ScopedCFTypeRef<CFStringRef> service_name(CFStringCreateWithCString(
+      kCFAllocatorDefault, remoting::kServiceName, kCFStringEncodingUTF8));
   CFNotificationCenterPostNotification(center, service_name, NULL, NULL,
                                        TRUE);
   return true;