diff options
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/dll_redirector_loading_test.cc | 6 | ||||
| -rw-r--r-- | chrome_frame/test/mock_ie_event_sink_actions.h | 4 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_scrubber.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index 404db0e..9040204 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -39,7 +39,7 @@ class DllRedirectorLoadingTest : public testing::Test { static void SetUpTestCase() { // First ensure that we can find the built Chrome Frame DLL. base::FilePath build_chrome_frame_dll = GetChromeFrameBuildPath(); - ASSERT_TRUE(file_util::PathExists(build_chrome_frame_dll)); + ASSERT_TRUE(base::PathExists(build_chrome_frame_dll)); // Then grab its version. scoped_ptr<FileVersionInfo> original_version_info( @@ -63,7 +63,7 @@ class DllRedirectorLoadingTest : public testing::Test { original_version_dir.Append(build_chrome_frame_dll.BaseName()); ASSERT_TRUE(base::CopyFile(build_chrome_frame_dll, original_chrome_frame_dll_)); - ASSERT_TRUE(file_util::PathExists(original_chrome_frame_dll_)); + ASSERT_TRUE(base::PathExists(original_chrome_frame_dll_)); // Temporary location for the new Chrome Frame DLL. base::FilePath temporary_new_chrome_frame_dll( @@ -95,7 +95,7 @@ class DllRedirectorLoadingTest : public testing::Test { new_version_dir.Append(build_chrome_frame_dll.BaseName()); ASSERT_TRUE(base::Move(temporary_new_chrome_frame_dll, new_chrome_frame_dll_)); - ASSERT_TRUE(file_util::PathExists(new_chrome_frame_dll_)); + ASSERT_TRUE(base::PathExists(new_chrome_frame_dll_)); } static void TearDownTestCase() { diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h index d952c81..9c8f4c7 100644 --- a/chrome_frame/test/mock_ie_event_sink_actions.h +++ b/chrome_frame/test/mock_ie_event_sink_actions.h @@ -385,7 +385,7 @@ ACTION_P(VerifySelectedText, expected_text) { ACTION_P3(CloseWhenFileSaved, mock, file, timeout_ms) { base::Time start = base::Time::Now(); - while (!file_util::PathExists(file)) { + while (!base::PathExists(file)) { if ((base::Time::Now() - start).InMilliseconds() > timeout_ms) { ADD_FAILURE() << "File was not saved within timeout"; TakeSnapshotAndLog(); @@ -398,7 +398,7 @@ ACTION_P3(CloseWhenFileSaved, mock, file, timeout_ms) { ACTION_P2(WaitForFileSave, file, timeout_ms) { base::Time start = base::Time::Now(); - while (!file_util::PathExists(file)) { + while (!base::PathExists(file)) { base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(200)); if ((base::Time::Now() - start).InMilliseconds() > timeout_ms) { ADD_FAILURE() << "File was not saved within timeout"; diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index f67baaf..d3e3140 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -480,7 +480,7 @@ BOOL SupplyProxyCredentials::EnumChildren(HWND hwnd, LPARAM param) { FakeExternalTab::FakeExternalTab() { user_data_dir_ = chrome_frame_test::GetProfilePathForIE(); - if (file_util::PathExists(user_data_dir_)) { + if (base::PathExists(user_data_dir_)) { VLOG(1) << __FUNCTION__ << " deleting IE Profile user data directory " << user_data_dir_.value(); bool deleted = base::Delete(user_data_dir_, true); diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc index 9699a17..37abcc3 100644 --- a/chrome_frame/test/test_scrubber.cc +++ b/chrome_frame/test/test_scrubber.cc @@ -112,7 +112,7 @@ void TestScrubber::CleanUpFromTestRun() { default_data_directory_ : data_directory_override_); - VLOG_IF(1, file_util::PathExists(data_directory)) + VLOG_IF(1, base::PathExists(data_directory)) << __FUNCTION__ << " deleting user data directory " << data_directory.value(); bool deleted = base::Delete(data_directory, true); diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 7ffb836..9c93a377 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -399,10 +399,10 @@ void MockWebServer::SendResponseHelper( std::string headers, body; std::string content_type; - if (file_util::PathExists(file_path) && + if (base::PathExists(file_path) && !file_util::DirectoryExists(file_path)) { base::FilePath mock_http_headers(file_path.value() + L".mock-http-headers"); - if (file_util::PathExists(mock_http_headers)) { + if (base::PathExists(mock_http_headers)) { headers = GetMockHttpHeaders(mock_http_headers); content_type = http_utils::GetHttpHeaderFromHeaderList("Content-type", headers); |