Enable a bunch of ui tests on Mac.

Review URL: http://codereview.chromium.org/63122

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13355 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 15 deletions

diff --git a/chrome/browser/interstitial_page_uitest.cc b/chrome/browser/interstitial_page_uitest.cc
index 0b32cad..844a92a 100644
--- a/chrome/browser/interstitial_page_uitest.cc
+++ b/chrome/browser/interstitial_page_uitest.cc
@@ -44,8 +44,6 @@ class InterstitialPageTest : public UITest {
   }
 };
 
-}  // namespace
-
 // Shows and hides an interstitial page.
 // Note that we cannot rely on the page title in this case (and we use the page
 // type instead) as showing an interstitial without creating a navigation entry
@@ -159,3 +157,5 @@ TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenCloseBrowser) {
   EXPECT_TRUE(CloseBrowser(browser_proxy.get(), &application_closed));
   EXPECT_TRUE(application_closed);
 }
+
+}  // namespace
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index d6946a9..1491d6d 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -43,8 +43,6 @@ class ResourceDispatcherTest : public UITest {
   }
 };
 
-}  // namespace
-
 TEST_F(ResourceDispatcherTest, SniffHTMLWithNoContentType) {
   CheckTitleTest(L"content-sniffer-test0.html",
                  L"Content Sniffer Test 0");
@@ -298,3 +296,5 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) {
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
   EXPECT_EQ(L"Title Of Awesomeness", tab_title);
 }
+
+}  // namespace
diff --git a/chrome/browser/tab_contents/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc
index ee16bf4..79e199c 100644
--- a/chrome/browser/tab_contents/view_source_uitest.cc
+++ b/chrome/browser/tab_contents/view_source_uitest.cc
@@ -32,8 +32,6 @@ class ViewSourceTest : public UITest {
    std::wstring test_html_;
 };
 
-}  // namespace
-
 // This test renders a page in view-source and then checks to see if a cookie
 // set in the html was set successfully (it shouldn't because we rendered the
 // page in view source)
@@ -107,3 +105,5 @@ TEST_F(ViewSourceTest, ViewSourceInPageMenuDisabledWhileViewingSource) {
 
   EXPECT_FALSE(IsPageMenuCommandEnabled(IDC_VIEW_SOURCE));
 }
+
+}  // namespace
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d387f50..3435760 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1996,18 +1996,11 @@
             'browser/crash_recovery_uitest.cc',
             'browser/download/download_uitest.cc',
             'browser/download/save_page_uitest.cc',
-            'browser/errorpage_uitest.cc',
-            'browser/iframe_uitest.cc',
-            'browser/interstitial_page_uitest.cc',
             'browser/login_prompt_uitest.cc',
             'browser/metrics/metrics_service_uitest.cc',
             'browser/renderer_host/resource_dispatcher_host_uitest.cc',
             'browser/sessions/session_restore_uitest.cc',
-            'browser/tab_contents/view_source_uitest.cc',
-            'common/net/cache_uitest.cc',
-            'common/pref_service_uitest.cc',
             'test/reliability/page_load_test.cc',
-            'test/ui/dom_checker_uitest.cc',
             'test/ui/layout_plugin_uitest.cc',
             'test/ui/omnibox_uitest.cc',
           ],
diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc
index a5b8ff2..aa8c49a 100644
--- a/chrome/test/ui/dom_checker_uitest.cc
+++ b/chrome/test/ui/dom_checker_uitest.cc
@@ -214,8 +214,6 @@ class DomCheckerTest : public UITest {
   DISALLOW_COPY_AND_ASSIGN(DomCheckerTest);
 };
 
-}  // namespace
-
 TEST_F(DomCheckerTest, File) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest))
     return;
@@ -233,3 +231,5 @@ TEST_F(DomCheckerTest, Http) {
   RunTest(true, &new_passes, &new_failures);
   PrintResults(new_passes, new_failures);
 }
+
+}  // namespace