Add missing tests to the GYP+Xcode build.

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

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

6 files changed, 43 insertions, 53 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 8b2da41..bacdb10 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -461,6 +461,7 @@
         'scoped_bstr_win_unittest.cc',
         'scoped_comptr_win_unittest.cc',
         'scoped_ptr_unittest.cc',
+        'scoped_temp_dir_unittest.cc',
         'sha2_unittest.cc',
         'shared_memory_unittest.cc',
         'simple_thread_unittest.cc',
@@ -473,7 +474,6 @@
         'string_util_unittest.cc',
         'sys_info_unittest.cc',
         'sys_string_conversions_unittest.cc',
-        'sys_string_conversions_unittest.cc',
         'system_monitor_unittest.cc',
         'thread_collision_warner_unittest.cc',
         'thread_local_storage_unittest.cc',
@@ -485,7 +485,9 @@
         'tracked_objects_unittest.cc',
         'tuple_unittest.cc',
         'values_unittest.cc',
+        'version_unittest.cc',
         'waitable_event_unittest.cc',
+        'waitable_event_watcher_unittest.cc',
         'watchdog_unittest.cc',
         'win_util_unittest.cc',
         'wmi_util_unittest.cc',
@@ -504,54 +506,42 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        [ 'OS == "linux"', {
-            'sources!': [
-              'file_version_info_unittest.cc',
-              # Linux has an implementation of idle_timer, but it's unclear
-              # if we want it yet, so leave it 'unported' for now.
-              'idletimer_unittest.cc',
-            ],
-          },
-          { # OS != "linux"
-            'sources!': [
-              'data_pack_unittest.cc',
-            ],
-          },
-        ],
-        [ 'OS == "mac"', {
-            'sources!': [
-              'stats_table_unittest.cc',
-            ],
-          },
-          { # OS != "mac"
-            'sources!': [
-              'mac_util_unittest.cc',
-            ],
-          },
-        ],
+        ['OS == "linux"', {
+          'sources!': [
+            'file_version_info_unittest.cc',
+            # Linux has an implementation of idle_timer, but it's unclear
+            # if we want it yet, so leave it 'unported' for now.
+            'idletimer_unittest.cc',
+          ],
+        }],
+        ['OS != "mac"', {
+          'sources!': [
+            'mac_util_unittest.cc',
+          ],
+        }],
         # This is needed to trigger the dll copy step on windows.
         # TODO(mark): This should not be necessary.
-        [ 'OS == "win"', {
-            'dependencies': [
-              '../third_party/icu38/icu38.gyp:icudata',
-            ],
-          },
-          {  # OS != "win", {
-            'sources!': [
-              'gfx/native_theme_unittest.cc',
-              'directory_watcher_unittest.cc',
-              'object_watcher_unittest.cc',
-              'pe_image_unittest.cc',
-              'scoped_bstr_win_unittest.cc',
-              'scoped_comptr_win_unittest.cc',
-              'system_monitor_unittest.cc',
-              'sys_string_conversions_unittest.cc',
-              'time_win_unittest.cc',
-              'win_util_unittest.cc',
-              'wmi_util_unittest.cc',
-            ],
-          }
-        ],
+        ['OS == "win"', {
+          'dependencies': [
+            '../third_party/icu38/icu38.gyp:icudata',
+          ],
+          'sources!': [
+            'data_pack_unittest.cc',
+          ],
+        }, {  # OS != "win"
+          'sources!': [
+            'gfx/native_theme_unittest.cc',
+            'directory_watcher_unittest.cc',
+            'object_watcher_unittest.cc',
+            'pe_image_unittest.cc',
+            'scoped_bstr_win_unittest.cc',
+            'scoped_comptr_win_unittest.cc',
+            'system_monitor_unittest.cc',
+            'time_win_unittest.cc',
+            'win_util_unittest.cc',
+            'wmi_util_unittest.cc',
+          ],
+        }],
       ],
     },
   ],
diff --git a/chrome/app/nibs/English.lproj/BrowserWindow.xib b/chrome/app/nibs/en.lproj/BrowserWindow.xib
index 42a88a2..42a88a2 100644
--- a/chrome/app/nibs/English.lproj/BrowserWindow.xib
+++ b/chrome/app/nibs/en.lproj/BrowserWindow.xib
diff --git a/chrome/app/nibs/English.lproj/MainMenu.xib b/chrome/app/nibs/en.lproj/MainMenu.xib
index e191c9a..e191c9a 100644
--- a/chrome/app/nibs/English.lproj/MainMenu.xib
+++ b/chrome/app/nibs/en.lproj/MainMenu.xib
diff --git a/chrome/app/nibs/English.lproj/TabContents.xib b/chrome/app/nibs/en.lproj/TabContents.xib
index 217660b..217660b 100644
--- a/chrome/app/nibs/English.lproj/TabContents.xib
+++ b/chrome/app/nibs/en.lproj/TabContents.xib
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 308a782..81aa3c4 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1334,9 +1334,9 @@
         'app/scoped_ole_initializer.h',
       ],
       'mac_bundle_resources': [
-        'app/nibs/English.lproj/BrowserWindow.xib',
-        'app/nibs/English.lproj/MainMenu.xib',
-        'app/nibs/English.lproj/TabContents.xib',
+        'app/nibs/en.lproj/BrowserWindow.xib',
+        'app/nibs/en.lproj/MainMenu.xib',
+        'app/nibs/en.lproj/TabContents.xib',
         'app/theme/chromium/chromium.icns',
         'app/theme/back.pdf',
         'app/theme/forward.pdf',
@@ -1423,7 +1423,7 @@
               'conditions': [
                 ['OS=="mac"', {
                   'outputs': [
-                    '<(INTERMEDIATE_DIR)/repack/English.lproj/locale.pak',
+                    '<(INTERMEDIATE_DIR)/repack/en.lproj/locale.pak',
                   ],
                 }, {  # else: OS!="mac"
                   'outputs': [
@@ -1705,7 +1705,6 @@
             'browser/download/download_request_manager_unittest.cc',
             'browser/extensions/user_script_master_unittest.cc',
             'browser/history/text_database_manager_unittest.cc',
-            'browser/history/text_database_unittest.cc',
             'browser/history/thumbnail_database_unittest.cc',
             'browser/importer/firefox_importer_unittest.cc',
             'browser/importer/importer_unittest.cc',
@@ -1737,7 +1736,6 @@
             'browser/visitedlink_unittest.cc',
             'browser/webdata/web_database_unittest.cc',
             'browser/window_sizer_unittest.cc',
-            'common/gfx/chrome_font_unittest.cc',
             'common/gfx/emf_unittest.cc',
             'common/gfx/icon_util_unittest.cc',
             'common/gfx/text_elider_unittest.cc',
diff --git a/net/net.gyp b/net/net.gyp
index 36a8550..e1c73d4 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -393,6 +393,7 @@
         'base/ssl_client_socket_unittest.cc',
         'base/ssl_config_service_unittest.cc',
         'base/tcp_client_socket_unittest.cc',
+        'base/tcp_pinger_unittest.cc',
         'base/telnet_server_unittest.cc',
         'base/test_completion_callback_unittest.cc',
         'base/wininet_util_unittest.cc',
@@ -424,6 +425,7 @@
         'http/http_vary_data_unittest.cc',
         'proxy/proxy_resolver_v8_unittest.cc',
         'proxy/proxy_script_fetcher_unittest.cc',
+        'proxy/proxy_server_unittest.cc',
         'proxy/proxy_service_unittest.cc',
         'url_request/url_request_unittest.cc',
         'url_request/url_request_unittest.h',