3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/test/pyautolib/pyautolib.cc b/chrome/test/pyautolib/pyautolib.cc
index 9f0dd41..5ebfe0f 100644
--- a/chrome/test/pyautolib/pyautolib.cc
+++ b/chrome/test/pyautolib/pyautolib.cc
@@ -98,14 +98,14 @@ bool PyUITestSuite::IsFindInPageVisible(int window_index) {
   return is_visible;
 }
 
-std::string PyUITestSuite::GetDownloadDirectory() {
+FilePath PyUITestSuite::GetDownloadDirectory() {
   FilePath download_dir;
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   EXPECT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
-    return download_dir.value();
+    return download_dir;
   EXPECT_TRUE(tab_proxy->GetDownloadDirectory(&download_dir));
-  return download_dir.value();
+  return download_dir;
 }
 
 bool PyUITestSuite::OpenNewBrowserWindow(bool show) {
diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h
index b6bb8c3..aab4dce 100644
--- a/chrome/test/pyautolib/pyautolib.h
+++ b/chrome/test/pyautolib/pyautolib.h
@@ -72,7 +72,7 @@ class PyUITestSuite : public UITestSuite, public UITestBase {
   bool IsFindInPageVisible(int window_index = 0);
 
   // Get the path to the downloads directory
-  std::string GetDownloadDirectory();
+  FilePath GetDownloadDirectory();
 
   // AutomationProxy methods
 
diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i
index f745fbb..28aa983 100644
--- a/chrome/test/pyautolib/pyautolib.i
+++ b/chrome/test/pyautolib/pyautolib.i
@@ -69,7 +69,7 @@ class FilePath {
   typedef std::wstring StringType;
 #else
   typedef std::string StringType;
-#endif  // OS_WIN
+#endif  // SWIGWIN
   const StringType& value() const;
   %feature("docstring", "Construct an empty FilePath or from a string.")
       FilePath;
@@ -110,7 +110,7 @@ class PyUITestSuite {
   // Get/fetch properties
   %feature("docstring",
            "Get the path to download directory.") GetDownloadDirectory;
-  std::string GetDownloadDirectory();
+  FilePath GetDownloadDirectory();
 
   %feature("docstring", "Get the path to profile directory.") user_data_dir;
   FilePath user_data_dir() const;