diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-07 00:04:53 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-07 00:04:53 +0000 |
| commit | 5a6ddb19886d009376be90a25b14e5a10a26b586 (patch) | |
| tree | a4b11d08ca7feee8ccbef9074fe16b0b1f78f0db /sql | |
| parent | b2ed3971b1a3a1f13c95d5144652e6c519c10c47 (diff) | |
| download | chromium_src-5a6ddb19886d009376be90a25b14e5a10a26b586.zip chromium_src-5a6ddb19886d009376be90a25b14e5a10a26b586.tar.gz chromium_src-5a6ddb19886d009376be90a25b14e5a10a26b586.tar.bz2 | |
Move more file_util functions to base namespace.
TBR=sky
Review URL: https://codereview.chromium.org/109043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/connection_unittest.cc | 8 | ||||
| -rw-r--r-- | sql/recovery_unittest.cc | 4 | ||||
| -rw-r--r-- | sql/test/test_helpers.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc index c6811b4..5aa7a9b 100644 --- a/sql/connection_unittest.cc +++ b/sql/connection_unittest.cc @@ -423,10 +423,10 @@ TEST_F(SQLConnectionTest, RazeEmptyDB) { db().Close(); { - file_util::ScopedFILE file(file_util::OpenFile(db_path(), "rb+")); + file_util::ScopedFILE file(base::OpenFile(db_path(), "rb+")); ASSERT_TRUE(file.get() != NULL); ASSERT_EQ(0, fseek(file.get(), 0, SEEK_SET)); - ASSERT_TRUE(file_util::TruncateFile(file.get())); + ASSERT_TRUE(base::TruncateFile(file.get())); } ASSERT_TRUE(db().Open(db_path())); @@ -441,7 +441,7 @@ TEST_F(SQLConnectionTest, RazeNOTADB) { ASSERT_FALSE(base::PathExists(db_path())); { - file_util::ScopedFILE file(file_util::OpenFile(db_path(), "wb")); + file_util::ScopedFILE file(base::OpenFile(db_path(), "wb")); ASSERT_TRUE(file.get() != NULL); const char* kJunk = "This is the hour of our discontent."; @@ -474,7 +474,7 @@ TEST_F(SQLConnectionTest, RazeNOTADB2) { db().Close(); { - file_util::ScopedFILE file(file_util::OpenFile(db_path(), "rb+")); + file_util::ScopedFILE file(base::OpenFile(db_path(), "rb+")); ASSERT_TRUE(file.get() != NULL); ASSERT_EQ(0, fseek(file.get(), 0, SEEK_SET)); diff --git a/sql/recovery_unittest.cc b/sql/recovery_unittest.cc index e9e77cf..e3c9738 100644 --- a/sql/recovery_unittest.cc +++ b/sql/recovery_unittest.cc @@ -77,7 +77,7 @@ int GetRootPage(sql::Connection* db, const char* name) { // per SQLite usage. bool ReadPage(const base::FilePath& path, size_t page_no, char* buf, size_t page_size) { - file_util::ScopedFILE file(file_util::OpenFile(path, "rb")); + file_util::ScopedFILE file(base::OpenFile(path, "rb")); if (!file.get()) return false; if (0 != fseek(file.get(), (page_no - 1) * page_size, SEEK_SET)) @@ -91,7 +91,7 @@ bool ReadPage(const base::FilePath& path, size_t page_no, // per SQLite usage. bool WritePage(const base::FilePath& path, size_t page_no, const char* buf, size_t page_size) { - file_util::ScopedFILE file(file_util::OpenFile(path, "rb+")); + file_util::ScopedFILE file(base::OpenFile(path, "rb+")); if (!file.get()) return false; if (0 != fseek(file.get(), (page_no - 1) * page_size, SEEK_SET)) diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc index a913352..6e12b04 100644 --- a/sql/test/test_helpers.cc +++ b/sql/test/test_helpers.cc @@ -55,7 +55,7 @@ bool CorruptSizeInHeader(const base::FilePath& db_path) { unsigned char header[kHeaderSize]; - file_util::ScopedFILE file(file_util::OpenFile(db_path, "rb+")); + file_util::ScopedFILE file(base::OpenFile(db_path, "rb+")); if (!file.get()) return false; |