commit c02b603251e022e6ce40aa50a7534e8fa416efab
author brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Feb 16 13:12:26 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 14:06:15 2020 +0900
tree 41225dd7004dd18eace6a21fb6756d58f15c4e9f
parent 97808a35b5ad75f896b9d99a40d6e830f72a20b2

Make base compile with no "using base::FilePath".

For base .cc files not using the base namespace, I added a using since theses
files should be moved to the base namespace, and then explicit qualification
will no longer be necessary.

Original review URL: https://codereview.chromium.org/12226121
(reland of r182040).
Review URL: https://codereview.chromium.org/12278014

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


CrOS-Libchrome-Original-Commit: 04af979a6940c84bc315b3bf6c946824f0262614

base/file_path.cc

diff --git a/base/file_path.cc b/base/file_path.cc
index fe2db15..d56d8d0 100644
--- a/base/file_path.cc
+++ b/base/file_path.cc
@@ -29,6 +29,8 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
+namespace base {
+
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
 const FilePath::CharType FilePath::kSeparators[] = FILE_PATH_LITERAL("\\/");
 #else  // FILE_PATH_USES_WIN_SEPARATORS
@@ -404,7 +406,7 @@
   return FilePath(ret);
 }
 
-FilePath FilePath::InsertBeforeExtensionASCII(const base::StringPiece& suffix)
+FilePath FilePath::InsertBeforeExtensionASCII(const StringPiece& suffix)
     const {
   DCHECK(IsStringASCII(suffix));
 #if defined(OS_WIN)
@@ -506,7 +508,7 @@
   return Append(component.value());
 }
 
-FilePath FilePath::AppendASCII(const base::StringPiece& component) const {
+FilePath FilePath::AppendASCII(const StringPiece& component) const {
   DCHECK(IsStringASCII(component));
 #if defined(OS_WIN)
   return Append(ASCIIToUTF16(component.as_string()));
@@ -544,7 +546,7 @@
 // platforms.  These encoding conversion functions are not quite correct.
 
 string16 FilePath::LossyDisplayName() const {
-  return WideToUTF16(base::SysNativeMBToWide(path_));
+  return WideToUTF16(SysNativeMBToWide(path_));
 }
 
 std::string FilePath::MaybeAsASCII() const {
@@ -557,7 +559,7 @@
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
   return value();
 #else
-  return WideToUTF8(base::SysNativeMBToWide(value()));
+  return WideToUTF8(SysNativeMBToWide(value()));
 #endif
 }
 
@@ -566,7 +568,7 @@
 
 // static
 FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
-  return FilePath(base::SysWideToNativeMB(wstring));
+  return FilePath(SysWideToNativeMB(wstring));
 }
 
 // static
@@ -574,7 +576,7 @@
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
   return FilePath(utf8);
 #else
-  return FilePath(base::SysWideToNativeMB(UTF8ToWide(utf8)));
+  return FilePath(SysWideToNativeMB(UTF8ToWide(utf8)));
 #endif
 }
 
@@ -1129,7 +1131,7 @@
 }
 
 StringType FilePath::GetHFSDecomposedForm(const StringType& string) {
-  base::mac::ScopedCFTypeRef<CFStringRef> cfstring(
+  mac::ScopedCFTypeRef<CFStringRef> cfstring(
       CFStringCreateWithBytesNoCopy(
           NULL,
           reinterpret_cast<const UInt8*>(string.c_str()),
@@ -1176,7 +1178,7 @@
   // GetHFSDecomposedForm() returns an empty string in an error case.
   if (hfs1.empty() || hfs2.empty()) {
     NOTREACHED();
-    base::mac::ScopedCFTypeRef<CFStringRef> cfstring1(
+    mac::ScopedCFTypeRef<CFStringRef> cfstring1(
         CFStringCreateWithBytesNoCopy(
             NULL,
             reinterpret_cast<const UInt8*>(string1.c_str()),
@@ -1184,7 +1186,7 @@
             kCFStringEncodingUTF8,
             false,
             kCFAllocatorNull));
-    base::mac::ScopedCFTypeRef<CFStringRef> cfstring2(
+    mac::ScopedCFTypeRef<CFStringRef> cfstring2(
         CFStringCreateWithBytesNoCopy(
             NULL,
             reinterpret_cast<const UInt8*>(string2.c_str()),
@@ -1251,6 +1253,8 @@
 #endif
 }
 
-void PrintTo(const FilePath& path, std::ostream* out) {
+}  // namespace base
+
+void PrintTo(const base::FilePath& path, std::ostream* out) {
   *out << path.value();
 }