Revert 182032
> 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.
>
> Review URL: https://codereview.chromium.org/12226121
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/12207132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182040 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 5272b32122055125dddef44d2e86c9cb7603f16f
diff --git a/base/command_line.cc b/base/command_line.cc
index 1c73846..b366165 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -20,8 +20,6 @@
#include <shellapi.h>
#endif
-using base::FilePath;
-
CommandLine* CommandLine::current_process_commandline_ = NULL;
namespace {
diff --git a/base/file_path.cc b/base/file_path.cc
index 7e05f49..fe2db15 100644
--- a/base/file_path.cc
+++ b/base/file_path.cc
@@ -29,8 +29,6 @@
#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
@@ -1256,5 +1254,3 @@
void PrintTo(const FilePath& path, std::ostream* out) {
*out << path.value();
}
-
-} // namespace base
diff --git a/base/file_util.cc b/base/file_util.cc
index 03e70f9..07f2771 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -18,8 +18,6 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
-using base::FilePath;
-
namespace {
const FilePath::CharType kExtensionSeparator = FILE_PATH_LITERAL('.');
diff --git a/base/file_util_linux.cc b/base/file_util_linux.cc
index cee2526..f7d4f6e 100644
--- a/base/file_util_linux.cc
+++ b/base/file_util_linux.cc
@@ -11,7 +11,7 @@
namespace file_util {
-bool GetFileSystemType(const base::FilePath& path, FileSystemType* type) {
+bool GetFileSystemType(const FilePath& path, FileSystemType* type) {
struct statfs statfs_buf;
if (statfs(path.value().c_str(), &statfs_buf) < 0) {
if (errno == ENOENT)
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index da7a096..5bf4fb1 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -58,8 +58,6 @@
#include "base/chromeos/chromeos_version.h"
#endif
-using base::FilePath;
-
namespace file_util {
namespace {
diff --git a/base/json/json_file_value_serializer.cc b/base/json/json_file_value_serializer.cc
index 5ee974b..2fac451 100644
--- a/base/json/json_file_value_serializer.cc
+++ b/base/json/json_file_value_serializer.cc
@@ -8,8 +8,6 @@
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
-using base::FilePath;
-
const char* JSONFileValueSerializer::kAccessDenied = "Access denied.";
const char* JSONFileValueSerializer::kCannotReadFile = "Can't read file.";
const char* JSONFileValueSerializer::kFileLocked = "File locked.";
diff --git a/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h
index 3869e5e..633db5d 100644
--- a/base/json/json_file_value_serializer.h
+++ b/base/json/json_file_value_serializer.h
@@ -18,7 +18,7 @@
// deserialization or the destination of the serialization.
// When deserializing, the file should exist, but when serializing, the
// serializer will attempt to create the file at the specified location.
- explicit JSONFileValueSerializer(const base::FilePath& json_file_path)
+ explicit JSONFileValueSerializer(const FilePath& json_file_path)
: json_file_path_(json_file_path),
allow_trailing_comma_(false) {}
@@ -74,7 +74,7 @@
private:
bool SerializeInternal(const Value& root, bool omit_binary_values);
- base::FilePath json_file_path_;
+ FilePath json_file_path_;
bool allow_trailing_comma_;
// A wrapper for file_util::ReadFileToString which returns a non-zero
diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc
index 98f37f8..63760bd 100644
--- a/base/nix/mime_util_xdg.cc
+++ b/base/nix/mime_util_xdg.cc
@@ -29,9 +29,6 @@
#include "base/message_loop.h"
#endif
-namespace base {
-namespace nix {
-
namespace {
class IconTheme;
@@ -586,6 +583,9 @@
} // namespace
+namespace base {
+namespace nix {
+
std::string GetFileMimeType(const FilePath& filepath) {
if (filepath.empty())
return std::string();
diff --git a/base/path_service.cc b/base/path_service.cc
index cb34d28..a19e78d 100644
--- a/base/path_service.cc
+++ b/base/path_service.cc
@@ -17,8 +17,6 @@
#include "base/logging.h"
#include "base/synchronization/lock.h"
-using base::FilePath;
-
namespace base {
bool PathProvider(int key, FilePath* result);
#if defined(OS_WIN)