commit c926e11bfbe69a268a7d753e301c39385ecca802
author thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jun 25 08:14:17 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 14:49:11 2020 +0900
tree b6571fe2c01b5f61679158c3aff7f75488709f53
parent a3c6e440c7c48fb144a07a6f657c8b5d8771dba7

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

Most references were updated from base::mac:: to base:: in r208245.
Manually fix up a few stragglers in this CL too.

BUG=251957
R=mark@chromium.org

Review URL: https://codereview.chromium.org/17618003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208287 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: dc4f4c2fc8e0083adafa8d381a33c1739936308a

base/files/file_path.cc

diff --git a/base/files/file_path.cc b/base/files/file_path.cc
index ef0cde6..be34634 100644
--- a/base/files/file_path.cc
+++ b/base/files/file_path.cc
@@ -1171,7 +1171,7 @@
 }
 
 StringType FilePath::GetHFSDecomposedForm(const StringType& string) {
-  mac::ScopedCFTypeRef<CFStringRef> cfstring(
+  ScopedCFTypeRef<CFStringRef> cfstring(
       CFStringCreateWithBytesNoCopy(
           NULL,
           reinterpret_cast<const UInt8*>(string.c_str()),
@@ -1218,7 +1218,7 @@
   // 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()),
@@ -1226,7 +1226,7 @@
             kCFStringEncodingUTF8,
             false,
             kCFAllocatorNull));
-    mac::ScopedCFTypeRef<CFStringRef> cfstring2(
+    ScopedCFTypeRef<CFStringRef> cfstring2(
         CFStringCreateWithBytesNoCopy(
             NULL,
             reinterpret_cast<const UInt8*>(string2.c_str()),