Make startup_tests build and work on Mac.

Also ensure that Chromium.app quits properly between the tests.

http://crbug.com/8391

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

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

1 files changed, 33 insertions, 45 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 05e1e5a..3afef30 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -393,6 +393,8 @@
         'browser/automation/automation_provider.cc',
         'browser/automation/automation_provider.h',
         'browser/automation/automation_provider_list.cc',
+        'browser/automation/automation_provider_list_generic.cc',
+        'browser/automation/automation_provider_list_mac.mm',
         'browser/automation/automation_provider_list.h',
         'browser/automation/automation_resource_tracker.cc',
         'browser/automation/automation_resource_tracker.h',
@@ -1218,6 +1220,7 @@
           'sources!': [
             'browser/autocomplete/autocomplete_edit.cc',
             'browser/autocomplete/autocomplete_popup_model.cc',
+            'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
             'browser/debugger/debugger_shell_stubs.cc',
@@ -1259,13 +1262,6 @@
           ],
         }, {  # 'OS!="win"
           'sources/': [
-            # Exclude most of automation.
-            ['exclude', '^browser/automation/'],
-            ['include', '^browser/automation/automation_provider\\.cc$'],
-            ['include', '^browser/automation/automation_provider_list\\.cc$'],
-            ['include', '^browser/automation/automation_resource_tracker\\.cc$'],
-            ['include', '^browser/automation/url_request_[^/]*_job\\.cc$'],
-
             # Exclude all of hang_monitor.
             ['exclude', '^browser/hang_monitor/'],
 
@@ -1286,6 +1282,7 @@
           'sources!': [
             'browser/app_modal_dialog_queue.cc',
             'browser/autocomplete/autocomplete_accessibility.cc',
+            'browser/automation/ui_controls.cc',
             'browser/browser_accessibility.cc',
             'browser/browser_accessibility_manager.cc',
             'browser/debugger/debugger_view.cc',
@@ -1694,16 +1691,6 @@
         'test/testing_profile.h',
       ],
       'conditions': [
-        ['OS=="mac"', {
-          'sources!': [
-            'test/automation/automation_proxy.cc',
-            'test/automation/automation_proxy.h',
-            'test/automation/browser_proxy.cc',
-            'test/automation/browser_proxy.h',
-            'test/automation/tab_proxy.cc',
-            'test/automation/tab_proxy.h',
-          ],
-        }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
@@ -2164,6 +2151,35 @@
         }],
       ],
     },
+    {
+      'target_name': 'startup_tests',
+      'type': 'executable',
+      'dependencies': [
+        'app',
+        'browser',
+        'common',
+        'resources',
+        'test_support_ui',
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        'test/startup/feature_startup_test.cc',
+        'test/startup/startup_test.cc',
+        'tools/build/win/precompiled.cc',
+        'tools/build/win/precompiled.h',
+      ],
+      'conditions': [
+        ['OS!="win"', {
+          'sources!': [
+            'test/startup/feature_startup_test.cc',
+            'tools/build/win/precompiled.cc',
+            'tools/build/win/precompiled.h',
+          ],
+        }],
+      ],
+    },
   ],
   'conditions': [
     ['OS=="mac"',
@@ -2241,34 +2257,6 @@
             }],
           ],
         },
-        {
-          'target_name': 'startup_tests',
-          'type': 'executable',
-          'dependencies': [
-            'browser',
-            'common',
-            'resources',
-            'test_support_ui',
-            '../base/base.gyp:base',
-            '../skia/skia.gyp:skia',
-            '../testing/gtest.gyp:gtest',
-          ],
-          'sources': [
-            'test/startup/feature_startup_test.cc',
-            'test/startup/startup_test.cc',
-            'tools/build/win/precompiled.cc',
-            'tools/build/win/precompiled.h',
-          ],
-          'conditions': [
-            ['OS!="win"', {
-              'sources!': [
-                'test/startup/feature_startup_test.cc',
-                'tools/build/win/precompiled.cc',
-                'tools/build/win/precompiled.h',
-              ],
-            }],
-          ],
-        },
       ],
     }],  # OS!="mac"
     ['OS=="win"',