diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 17:36:07 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 17:36:07 +0000 |
commit | 7567484144da059e2c2c2a818b06660a5459052f (patch) | |
tree | a4ceafc7e890051c25dbdd54b170d0f5794dd229 /chrome_frame | |
parent | 8a25d54d6eb190a8b82479b5309a892c1080a372 (diff) | |
download | chromium_src-7567484144da059e2c2c2a818b06660a5459052f.zip chromium_src-7567484144da059e2c2c2a818b06660a5459052f.tar.gz chromium_src-7567484144da059e2c2c2a818b06660a5459052f.tar.bz2 |
Move PathExists to base namespace.
BUG=
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/18286004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/chrome_launcher_utils.cc | 4 | ||||
-rw-r--r-- | chrome_frame/chrome_tab.cc | 6 | ||||
-rw-r--r-- | chrome_frame/simple_resource_loader.cc | 4 | ||||
-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 | ||||
-rw-r--r-- | chrome_frame/test_utils.cc | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/chrome_frame/chrome_launcher_utils.cc b/chrome_frame/chrome_launcher_utils.cc index b120a94..fbfa66d 100644 --- a/chrome_frame/chrome_launcher_utils.cc +++ b/chrome_frame/chrome_launcher_utils.cc @@ -34,7 +34,7 @@ bool CreateChromeLauncherCommandLine(scoped_ptr<CommandLine>* command_line) { base::FilePath current_dir = module_path.DirName(); base::FilePath chrome_launcher = current_dir.Append( chrome_launcher::kLauncherExeBaseName); - if (file_util::PathExists(chrome_launcher)) { + if (base::PathExists(chrome_launcher)) { command_line->reset(new CommandLine(chrome_launcher)); success = true; } @@ -98,7 +98,7 @@ base::FilePath GetChromeExecutablePath() { // sub-folder one down from the Chrome executable. If we fail to find // chrome.exe in the current path, try looking one up and launching that // instead. - if (!file_util::PathExists(cur_path)) { + if (!base::PathExists(cur_path)) { PathService::Get(base::DIR_MODULE, &cur_path); cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName); } diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index a563ded..177b9ac 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -344,12 +344,12 @@ HRESULT SetupUserLevelHelper() { if (PathService::Get(base::FILE_MODULE, &module_path)) { module_path = module_path.DirName(); helper_path = module_path.Append(kChromeFrameHelperExe); - if (!file_util::PathExists(helper_path)) { + if (!base::PathExists(helper_path)) { // If we can't find the helper in the current directory, try looking // one up (this is the layout in the build output folder). module_path = module_path.DirName(); helper_path = module_path.Append(kChromeFrameHelperExe); - DCHECK(file_util::PathExists(helper_path)) << + DCHECK(base::PathExists(helper_path)) << "Could not find chrome_frame_helper.exe."; } @@ -357,7 +357,7 @@ HRESULT SetupUserLevelHelper() { HWND old_window = FindWindow(kChromeFrameHelperWindowClassName, kChromeFrameHelperWindowName); - if (file_util::PathExists(helper_path)) { + if (base::PathExists(helper_path)) { std::wstring helper_path_cmd(L"\""); helper_path_cmd += helper_path.value(); helper_path_cmd += L"\" "; diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 187e0b7..3d4426a 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -205,8 +205,8 @@ bool SimpleResourceLoader::LoadLocalePack( locales_path.Append(*scan + pack_suffix); base::FilePath dll_path = locales_path.Append(*scan + dll_suffix); - if (file_util::PathExists(resource_pack_path) && - file_util::PathExists(dll_path)) { + if (base::PathExists(resource_pack_path) && + base::PathExists(dll_path)) { scoped_ptr<ui::DataPack> cur_data_pack( new ui::DataPack(ui::SCALE_FACTOR_100P)); if (!cur_data_pack->LoadFromPath(resource_pack_path)) 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); diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index 0b99896..a473732 100644 --- a/chrome_frame/test_utils.cc +++ b/chrome_frame/test_utils.cc @@ -36,12 +36,12 @@ base::FilePath GetChromeFrameBuildPath() { base::FilePath dll_path = build_path.Append(kChromeFrameDllName); - if (!file_util::PathExists(dll_path)) { + if (!base::PathExists(dll_path)) { // Well, dang.. try looking in the current directory. dll_path = build_path.Append(kChromeFrameDllName); } - if (!file_util::PathExists(dll_path)) { + if (!base::PathExists(dll_path)) { // No luck, return something empty. dll_path = base::FilePath(); } |