diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
commit | 7600d0b2d5e37b211280d5109a6b726644d6be76 (patch) | |
tree | 4ba2cb5383bb9ef5f610aeffe5d4455149da683b /sql | |
parent | a4f7378f973b38400f133958842eb36db0b61dcb (diff) | |
download | chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.zip chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.gz chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.bz2 |
Revert 239400 "Revert 239280 "Move more file_util functions to b..."
Broke all bots 9_9
> Revert 239280 "Move more file_util functions to base namespace."
>
> dbus_unittests started fialing on Linux Tests (dbg)(2) and Linux Tests (dbg)(2)(32).
> This CL is the only in the intersection of CLs in the first failing build on
> the two builders, so giving a speculative revert a try (rlarocque already
> tried a clobber, it didn't help).
>
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/41806
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/builds/8544
>
>
> > Move more file_util functions to base namespace.
> >
> > TBR=sky
> >
> > Review URL: https://codereview.chromium.org/109043002
>
> TBR=brettw@chromium.org
>
> Review URL: https://codereview.chromium.org/105823009
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/100923007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql')
-rw-r--r-- | sql/connection_unittest.cc | 8 | ||||
-rw-r--r-- | sql/test/test_helpers.cc | 2 |
2 files changed, 5 insertions, 5 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/test/test_helpers.cc b/sql/test/test_helpers.cc index 8d13d01..8d56140 100644 --- a/sql/test/test_helpers.cc +++ b/sql/test/test_helpers.cc @@ -75,7 +75,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; |