Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1046)

Unified Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 12211108: Rename FilePath -> base::FilePath in various toplevel directories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.h ('k') | chrome_frame/test/net/test_automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/net/fake_external_tab.cc
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 46405087c91523cf155f72f6a38b8005b436e2e7..1f0f5df4607a166ab5cb5f5f42be51b80dfae2b9 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -487,7 +487,7 @@ void FakeExternalTab::Initialize() {
TestTimeouts::Initialize();
// Load Chrome.dll as our resource dll.
- FilePath dll;
+ base::FilePath dll;
PathService::Get(base::DIR_MODULE, &dll);
dll = dll.Append(chrome::kBrowserResourcesDll);
HMODULE res_mod = ::LoadLibraryExW(dll.value().c_str(),
@@ -504,7 +504,7 @@ void FakeExternalTab::Initialize() {
cmd->AppendSwitch(switches::kDisableWebResources);
cmd->AppendSwitch(switches::kSingleProcess);
- FilePath local_state_path;
+ base::FilePath local_state_path;
CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
scoped_refptr<base::SequencedTaskRunner> local_state_task_runner =
JsonPrefStore::GetTaskRunnerForFile(local_state_path,
@@ -527,7 +527,8 @@ void FakeExternalTab::Initialize() {
}
void FakeExternalTab::InitializePostThreadsCreated() {
- FilePath profile_path(ProfileManager::GetDefaultProfileDir(user_data()));
+ base::FilePath profile_path(
+ ProfileManager::GetDefaultProfileDir(user_data()));
Profile* profile =
g_browser_process->profile_manager()->GetProfile(profile_path);
}
@@ -713,9 +714,9 @@ void CFUrlRequestUnittestRunner::TakeDownBrowser() {
}
void CFUrlRequestUnittestRunner::InitializeLogging() {
- FilePath exe;
+ base::FilePath exe;
PathService::Get(base::FILE_EXE, &exe);
- FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
+ base::FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
logging::InitLogging(
log_filename.value().c_str(),
logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
@@ -744,7 +745,7 @@ void CFUrlRequestUnittestRunner::StartInitializationTimeout() {
void CFUrlRequestUnittestRunner::OnInitializationTimeout() {
LOG(ERROR) << "Failed to start Chrome Frame in the host browser.";
- FilePath snapshot;
+ base::FilePath snapshot;
if (ui_test_utils::SaveScreenSnapshotToDesktop(&snapshot))
LOG(ERROR) << "Screen snapshot saved to " << snapshot.value();
@@ -784,7 +785,7 @@ int CFUrlRequestUnittestRunner::PreCreateThreads() {
}
bool CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback(
- const CommandLine& command_line, const FilePath& current_directory) {
+ const CommandLine& command_line, const base::FilePath& current_directory) {
std::string channel_id = command_line.GetSwitchValueASCII(
switches::kAutomationClientChannelID);
EXPECT_FALSE(channel_id.empty());
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.h ('k') | chrome_frame/test/net/test_automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698