6 files changed, 13 insertions, 15 deletions
diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index dddac9a..bd10ad7 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -136,8 +136,7 @@ bool DownloadFile::Open(const char* open_mode) {
   // We ignore the return value because a failure is not fatal.
   win_util::SetInternetZoneIdentifier(full_path_);
 #elif defined(OS_MACOSX)
-  // TODO(port) there should be an equivalent on Mac (there isn't on Linux).
-  NOTREACHED();
+  // TODO(port): Set quarrantine information, http://crbug.com/10853
 #endif
   return true;
 }
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index 5310252..18eaed2 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -154,8 +154,6 @@ class DownloadTest : public UITest {
   FilePath download_prefix_;
 };
 
-}  // namespace
-
 // Download a file with non-viewable content, verify that the
 // download tab opened and the file exists.
 TEST_F(DownloadTest, DownloadMimeType) {
@@ -250,3 +248,5 @@ TEST_F(DownloadTest, DISABLED_KnownSize) {
   RunSizeTest(url, L"71% - " + filename.ToWStringHack(),
               L"100% - " + filename.ToWStringHack());
 }
+
+}  // namespace
diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc
index ecb15e8..bac6b86 100644
--- a/chrome/browser/download/save_page_uitest.cc
+++ b/chrome/browser/download/save_page_uitest.cc
@@ -22,8 +22,8 @@ const std::string kTestDir = "save_page";
 const std::string kAppendedExtension = ".htm";
 #elif defined(OS_LINUX)
 const std::string kAppendedExtension = "";
-#elif defined(OS_MAC)
-// TODO(port): figure this out for mac.
+#elif defined(OS_MACOSX)
+const std::string kAppendedExtension = ".html";
 #endif
 
 class SavePageTest : public UITest {
@@ -169,8 +169,8 @@ TEST_F(SavePageTest, FilenameFromPageTitle) {
 }
 
 // This tests that a webpage with the title "test.exe" is saved as "test.htm".
-// We probably don't care to handle this on linux.
-#if !defined(OS_LINUX)
+// We probably don't care to handle this on Linux or Mac.
+#if defined(OS_WIN)
 TEST_F(SavePageTest, CleanFilenameFromPageTitle) {
   std::string file_name = "c.htm";
   FilePath full_file_name = download_dir_.AppendASCII("test" +
diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc
index 1d27804..929a5e1 100644
--- a/chrome/browser/history/redirect_uitest.cc
+++ b/chrome/browser/history/redirect_uitest.cc
@@ -27,8 +27,6 @@ class RedirectTest : public UITest {
   }
 };
 
-}  // namespace
-
 // Tests a single server redirect
 TEST_F(RedirectTest, Server) {
   scoped_refptr<HTTPTestServer> server =
@@ -309,3 +307,5 @@ TEST_F(RedirectTest,
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }
+
+}  // namespace
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc
index a74d8e4..fa5cb79 100644
--- a/chrome/browser/session_history_uitest.cc
+++ b/chrome/browser/session_history_uitest.cc
@@ -102,8 +102,6 @@ class SessionHistoryTest : public UITest {
   scoped_ptr<TabProxy> tab_;
 };
 
-}  // namespace
-
 TEST_F(SessionHistoryTest, BasicBackForward) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
@@ -502,3 +500,5 @@ TEST_F(SessionHistoryTest, DISABLED_LocationReplace) {
       "files/session_history/replace.html?no-title.html")));
   EXPECT_EQ(L"", GetTabTitle());
 }
+
+}  // namespace
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7d69594..d2613a0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2053,13 +2053,12 @@
             # TODO(port)
             'app/chrome_main_uitest.cc',
             'browser/crash_recovery_uitest.cc',
-            'browser/download/download_uitest.cc',
+            # blocked on download shelf
             'browser/download/save_page_uitest.cc',
-            'browser/history/redirect_uitest.cc',
             'browser/login_prompt_uitest.cc',
             'browser/metrics/metrics_service_uitest.cc',
-            'browser/session_history_uitest.cc',
             'browser/sessions/session_restore_uitest.cc',
+            # blocked on ChromeBrowserProcessId()
             'test/chrome_process_util_uitest.cc',
             'test/reliability/page_load_test.cc',
             'test/ui/layout_plugin_uitest.cc',