mac: Remove ScopedCFTypeRef from base::mac::.

base/files/file_path.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 
 #include <string.h>
 #include <algorithm>
 
 #include "base/basictypes.h"
@@ skipping 1153 matching lines @@
       return (codepoint1 < codepoint2) ? -1 : 1;
     if (codepoint1 == 0) {
       DCHECK_EQ(index1, length1);
       DCHECK_EQ(index2, length2);
       return 0;
     }
   }
 }
 
 StringType FilePath::GetHFSDecomposedForm(const StringType& string) {
-  mac::ScopedCFTypeRef<CFStringRef> cfstring(
+  ScopedCFTypeRef<CFStringRef> cfstring(
       CFStringCreateWithBytesNoCopy(
           NULL,
           reinterpret_cast<const UInt8*>(string.c_str()),
           string.length(),
           kCFStringEncodingUTF8,
           false,
           kCFAllocatorNull));
   // Query the maximum length needed to store the result. In most cases this
   // will overestimate the required space. The return value also already
   // includes the space needed for a terminating 0.
@@ skipping 26 matching lines @@
     return string2.empty() ? 0 : -1;
   if (string2.empty())
     return 1;
 
   StringType hfs1 = GetHFSDecomposedForm(string1);
   StringType hfs2 = GetHFSDecomposedForm(string2);
 
   // GetHFSDecomposedForm() returns an empty string in an error case.
   if (hfs1.empty() || hfs2.empty()) {
     NOTREACHED();
-    mac::ScopedCFTypeRef<CFStringRef> cfstring1(
+    ScopedCFTypeRef<CFStringRef> cfstring1(
         CFStringCreateWithBytesNoCopy(
             NULL,
             reinterpret_cast<const UInt8*>(string1.c_str()),
             string1.length(),
             kCFStringEncodingUTF8,
             false,
             kCFAllocatorNull));
-    mac::ScopedCFTypeRef<CFStringRef> cfstring2(
+    ScopedCFTypeRef<CFStringRef> cfstring2(
         CFStringCreateWithBytesNoCopy(
             NULL,
             reinterpret_cast<const UInt8*>(string2.c_str()),
             string2.length(),
             kCFStringEncodingUTF8,
             false,
             kCFAllocatorNull));
     return CFStringCompare(cfstring1,
                            cfstring2,
                            kCFCompareCaseInsensitive);
@@ skipping 51 matching lines @@
 #else
   return *this;
 #endif
 }
 
 }  // namespace base
 
 void PrintTo(const base::FilePath& path, std::ostream* out) {
   *out << path.value();
 }