Cleanup: Remove unneeded base/file_util.h includes in base.
Review URL: https://chromiumcodereview.appspot.com/15078003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199960 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 6d7f55fec25ef2b80d3bae5b86ab905eb90f970f
diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc
index 28778d9..dbc9244 100644
--- a/base/files/file_path_unittest.cc
+++ b/base/files/file_path_unittest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/basictypes.h"
-#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -1122,32 +1121,32 @@
TEST_F(FilePathTest, ConstructWithNUL) {
// Assert FPS() works.
- ASSERT_TRUE(FPS("a\0b").length() == 3);
+ ASSERT_EQ(3U, FPS("a\0b").length());
// Test constructor strips '\0'
FilePath path(FPS("a\0b"));
- EXPECT_TRUE(path.value().length() == 1);
- EXPECT_EQ(path.value(), FPL("a"));
+ EXPECT_EQ(1U, path.value().length());
+ EXPECT_EQ(FPL("a"), path.value());
}
TEST_F(FilePathTest, AppendWithNUL) {
// Assert FPS() works.
- ASSERT_TRUE(FPS("b\0b").length() == 3);
+ ASSERT_EQ(3U, FPS("b\0b").length());
// Test Append() strips '\0'
FilePath path(FPL("a"));
path = path.Append(FPS("b\0b"));
- EXPECT_TRUE(path.value().length() == 3);
+ EXPECT_EQ(3U, path.value().length());
#if defined(FILE_PATH_USES_WIN_SEPARATORS)
- EXPECT_EQ(path.value(), FPL("a\\b"));
+ EXPECT_EQ(FPL("a\\b"), path.value());
#else
- EXPECT_EQ(path.value(), FPL("a/b"));
+ EXPECT_EQ(FPL("a/b"), path.value());
#endif
}
TEST_F(FilePathTest, ReferencesParentWithNUL) {
// Assert FPS() works.
- ASSERT_TRUE(FPS("..\0").length() == 3);
+ ASSERT_EQ(3U, FPS("..\0").length());
// Test ReferencesParent() doesn't break with "..\0"
FilePath path(FPS("..\0"));
diff --git a/base/files/file_path_watcher_kqueue.cc b/base/files/file_path_watcher_kqueue.cc
index 1c086de..64c9d59 100644
--- a/base/files/file_path_watcher_kqueue.cc
+++ b/base/files/file_path_watcher_kqueue.cc
@@ -171,7 +171,7 @@
int last_existing_entry = 0;
FilePath built_path;
bool path_still_exists = true;
- for(std::vector<FilePath::StringType>::iterator i = components.begin();
+ for (std::vector<FilePath::StringType>::iterator i = components.begin();
i != components.end(); ++i) {
if (i == components.begin()) {
built_path = FilePath(*i);
diff --git a/base/files/file_util_proxy.h b/base/files/file_util_proxy.h
index d155355..c5168ad 100644
--- a/base/files/file_util_proxy.h
+++ b/base/files/file_util_proxy.h
@@ -7,7 +7,6 @@
#include "base/base_export.h"
#include "base/callback_forward.h"
-#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/platform_file.h"
diff --git a/base/files/file_util_proxy_unittest.cc b/base/files/file_util_proxy_unittest.cc
index 9a5a0d6..ef23fd8 100644
--- a/base/files/file_util_proxy_unittest.cc
+++ b/base/files/file_util_proxy_unittest.cc
@@ -7,6 +7,7 @@
#include <map>
#include "base/bind.h"
+#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
@@ -194,17 +195,17 @@
// The file should be writable.
#if defined(OS_WIN)
- HANDLE hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
- OVERLAPPED overlapped = {0};
- overlapped.hEvent = hEvent;
- DWORD bytes_written;
- if (!::WriteFile(file_, "test", 4, &bytes_written, &overlapped)) {
- // Temporary file is created with ASYNC flag, so WriteFile may return 0
- // with ERROR_IO_PENDING.
- EXPECT_EQ(ERROR_IO_PENDING, GetLastError());
- GetOverlappedResult(file_, &overlapped, &bytes_written, TRUE);
- }
- EXPECT_EQ(4, bytes_written);
+ HANDLE hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+ OVERLAPPED overlapped = {0};
+ overlapped.hEvent = hEvent;
+ DWORD bytes_written;
+ if (!::WriteFile(file_, "test", 4, &bytes_written, &overlapped)) {
+ // Temporary file is created with ASYNC flag, so WriteFile may return 0
+ // with ERROR_IO_PENDING.
+ EXPECT_EQ(ERROR_IO_PENDING, GetLastError());
+ GetOverlappedResult(file_, &overlapped, &bytes_written, TRUE);
+ }
+ EXPECT_EQ(4, bytes_written);
#else
// On POSIX ASYNC flag does not affect synchronous read/write behavior.
EXPECT_EQ(4, WritePlatformFile(file_, 0, "test", 4));