Compile all the chrome_test UI tests on the Mac

Removes the last of the ui test exceptions on the Mac, disabling a couple of tests as necessary to keep things green.

BUG=45108,45243
TEST=Tests run

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

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

3 files changed, 18 insertions, 10 deletions

diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc
index 5ddfcca..3ea4343 100644
--- a/chrome/app/chrome_main_uitest.cc
+++ b/chrome/app/chrome_main_uitest.cc
@@ -39,6 +39,10 @@ TEST_F(ChromeMainTest, AppTestingInterface) {
   EXPECT_EQ(1, GetTabCount());
 }
 
+#if defined(OS_MACOSX)
+// Fails an SQL assertion on Mac: http://crbug.com/45108
+#define SecondLaunch DISABLED_SecondLaunch
+#endif
 // Make sure that the second invocation creates a new window.
 TEST_F(ChromeMainTest, SecondLaunch) {
   include_testing_id_ = false;
@@ -50,6 +54,11 @@ TEST_F(ChromeMainTest, SecondLaunch) {
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2));
 }
 
+#if defined(OS_MACOSX)
+// Fails an SQL assertion on Mac: http://crbug.com/45108
+#define ReuseBrowserInstanceWhenOpeningFile \
+    DISABLED_ReuseBrowserInstanceWhenOpeningFile
+#endif
 TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
   include_testing_id_ = false;
   use_existing_browser_ = true;
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9f822b3..5a42f1d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -372,13 +372,6 @@
           ],
         }],
         ['OS=="mac"', {
-          'sources!': [
-            # TODO(port)
-            'app/chrome_main_uitest.cc',
-            'browser/metrics/metrics_service_uitest.cc',
-            'common/logging_chrome_uitest.cc',
-            'test/ui/fast_shutdown_uitest.cc',
-          ],
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index f52ab7d..1b64cae 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -20,8 +20,6 @@
 #include "chrome/test/ui/ui_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
 class ChromeLoggingTest : public testing::Test {
  public:
   // Stores the current value of the log file name environment
@@ -54,7 +52,6 @@ class ChromeLoggingTest : public testing::Test {
  private:
   std::string environment_filename_;  // Saves real environment value.
 };
-};
 
 // Tests the log file name getter without an environment variable.
 TEST_F(ChromeLoggingTest, LogFileName) {
@@ -106,6 +103,9 @@ class AssertionTest : public UITest {
 #if defined(OS_WIN)
 // http://crbug.com/26715
 #define Assertion DISABLED_Assertion
+#elif defined(OS_MACOSX)
+// Crash service doesn't exist for the Mac yet: http://crbug.com/45243
+#define Assertion DISABLED_Assertion
 #endif
 TEST_F(AssertionTest, Assertion) {
   if (UITest::in_process_renderer()) {
@@ -137,6 +137,9 @@ class CheckFalseTest : public UITest {
 #if defined(OS_WIN)
 // http://crbug.com/38497
 #define CheckFails FLAKY_CheckFails
+#elif defined(OS_MACOSX)
+// Crash service doesn't exist for the Mac yet: http://crbug.com/45243
+#define CheckFails DISABLED_CheckFails
 #endif
 // Launch the app in assertion test mode, then close the app.
 TEST_F(CheckFalseTest, CheckFails) {
@@ -175,6 +178,9 @@ class RendererCrashTest : public UITest {
 #elif defined(OS_CHROMEOS)
 // http://crbug.com/43115
 #define Crash DISABLED_Crash
+#elif defined(OS_MACOSX)
+// Crash service doesn't exist for the Mac yet: http://crbug.com/45243
+#define Crash DISABLED_Crash
 #endif
 // Launch the app in renderer crash test mode, then close the app.
 TEST_F(RendererCrashTest, Crash) {