diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 2 | ||||
-rw-r--r-- | chrome/test/automation/tab_proxy.cc | 2 | ||||
-rw-r--r-- | chrome/test/automation/tab_proxy.h | 2 | ||||
-rw-r--r-- | chrome/test/ui/ui_test.cc | 6 | ||||
-rw-r--r-- | chrome/test/ui/ui_test.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index 89f90ff..5836ec6 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -338,7 +338,7 @@ IPC_BEGIN_MESSAGES(Automation) // Gets the directory that downloads will occur in for the active profile. IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_DownloadDirectory, int /* tab_handle */, - std::wstring /* directory */) + FilePath /* directory */) // This message requests the id of the view that has the focus in the // specified window. If no view is focused, -1 is returned. Note that the diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index eb00d74..76965e5 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -451,7 +451,7 @@ int TabProxy::InspectElement(int x, int y) { return ret; } -bool TabProxy::GetDownloadDirectory(std::wstring* directory) { +bool TabProxy::GetDownloadDirectory(FilePath* directory) { DCHECK(directory); if (!is_valid()) return false; diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index 94bf717..7209ada 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -223,7 +223,7 @@ class TabProxy : public AutomationResourceProxy { // |target_count|. bool WaitForBlockedPopupCountToChangeTo(int target_count, int wait_timeout); - bool GetDownloadDirectory(std::wstring* download_directory); + bool GetDownloadDirectory(FilePath* download_directory); // Shows an interstitial page. Blocks until the interstitial page // has been loaded. Return false if a failure happens.3 diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index cfabbc2..65a453d 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -733,13 +733,13 @@ void UITest::WaitUntilTabCount(int tab_count) { EXPECT_EQ(tab_count, GetTabCount()); } -std::wstring UITest::GetDownloadDirectory() { +FilePath UITest::GetDownloadDirectory() { scoped_refptr<TabProxy> tab_proxy(GetActiveTab()); EXPECT_TRUE(tab_proxy.get()); if (!tab_proxy.get()) - return std::wstring(); + return FilePath(); - std::wstring download_directory; + FilePath download_directory; EXPECT_TRUE(tab_proxy->GetDownloadDirectory(&download_directory)); return download_directory; } diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index ae62a6e..5c45e8c 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -269,7 +269,7 @@ class UITest : public testing::Test { bool important); // Gets the directory for the currently active profile in the browser. - std::wstring GetDownloadDirectory(); + FilePath GetDownloadDirectory(); // Get the handle of browser process connected to the automation. This // function only retruns a reference to the handle so the caller does not |