diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:23:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:23:50 +0000 |
| commit | 82f84b91a10f513cd59b8382a7ab00ed0f179bd5 (patch) | |
| tree | 125081aff715fbe6815e8bb81889d4d49f887cf3 /chrome_frame | |
| parent | 88a8115978d75161674d97cde0761cbdba73daed (diff) | |
| download | chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.zip chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.tar.gz chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.tar.bz2 | |
Move ReadFileToString to the base namespace.
BUG=
Review URL: https://codereview.chromium.org/19579005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/html_util_unittests.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/navigation_test.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/urlmon_moniker_unittest.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index 5431f1e..4ec4b72 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -67,7 +67,7 @@ class HtmlUtilUnittest : public testing::Test { } std::string raw_data; - file_util::ReadFileToString(path, &raw_data); + base::ReadFileToString(path, &raw_data); // Convert to wide using the "best effort" assurance described in // string_util.h diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index 2f5ab33..fca132c 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -871,7 +871,7 @@ TEST_F(FullTabDownloadTest, CF_DownloadFileFromPost) { LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout); std::string data; - EXPECT_TRUE(file_util::ReadFileToString(temp_file_path, &data)); + EXPECT_TRUE(base::ReadFileToString(temp_file_path, &data)); EXPECT_EQ("hello", data); file_util::DieFileDie(temp_file_path, false); } diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 68df297..2f762c3 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -58,7 +58,7 @@ std::string CreateHttpHeaders(CFInvocation invocation, std::string GetMockHttpHeaders(const base::FilePath& mock_http_headers_path) { std::string headers; - file_util::ReadFileToString(mock_http_headers_path, &headers); + base::ReadFileToString(mock_http_headers_path, &headers); return headers; } @@ -417,7 +417,7 @@ void MockWebServer::SendResponseHelper( EXPECT_FALSE(headers.empty()); - EXPECT_TRUE(file_util::ReadFileToString(file_path, &body)) + EXPECT_TRUE(base::ReadFileToString(file_path, &body)) << "Could not read file (" << WideToUTF8(file_path.value()) << ")"; if (invocation.type() == CFInvocation::META_TAG && StartsWithASCII(content_type, "text/html", false)) { diff --git a/chrome_frame/test/urlmon_moniker_unittest.cc b/chrome_frame/test/urlmon_moniker_unittest.cc index 161636f..75c9c319 100644 --- a/chrome_frame/test/urlmon_moniker_unittest.cc +++ b/chrome_frame/test/urlmon_moniker_unittest.cc @@ -32,7 +32,7 @@ class MonikerPatchTest : public testing::Test { bool ReadFileAsString(const wchar_t* file_name, std::string* file_contents) { EXPECT_TRUE(file_name); base::FilePath file_path = test_file_path_.Append(file_name); - return file_util::ReadFileToString(file_path, file_contents); + return base::ReadFileToString(file_path, file_contents); } static bool StringToStream(const std::string& data, IStream** ret) { |