Get rid of ui_cocoa_third_party_toolkits target from ui.gyp

chrome/chrome_tests.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables' : {
     'chromedriver_unittest_sources': [
       'test/chromedriver/capabilities_unittest.cc',
       'test/chromedriver/chrome/chrome_finder_unittest.cc',
       'test/chromedriver/chrome/console_logger_unittest.cc',
       'test/chromedriver/chrome/device_manager_unittest.cc',
@@ skipping 1865 matching lines @@
             '../build/linux/system.gyp:gtk',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['OS=="mac"', {
           'include_dirs': [
-            '../third_party/GTM',
+            '../third_party/google_toolbox_for_mac/src',

[Mark Mentovai, 2013/12/13 23:03:20]

Same here and line 2180. Depend on GTM, since it’s apparently necessary. Don’t
write GTM include_dirs into .gyp files anymore. That was a crutch that was
necessary because GTM wasn’t its own target. Where you find these now, it’s an
indication that the target that’s got this in its include_dirs is using GTM and
needs to depend on it.

[tfarina, 2013/12/16 02:42:03]

Done.

           ],
           # TODO(mark): We really want this for all non-static library
           # targets, but when we tried to pull it up to the common.gypi
           # level, it broke other things like the ui and startup tests. *shrug*
           'xcode_settings': {
             'OTHER_LDFLAGS': [
               '-Wl,-ObjC',
             ],
           },
           # Other platforms only need
@@ skipping 273 matching lines @@
             '../build/linux/system.gyp:gtk',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['OS=="mac"', {
           'include_dirs': [
-            '../third_party/GTM',
+            '../third_party/google_toolbox_for_mac/src',

[Mark Mentovai, 2013/12/13 23:03:20]

Me too.

[tfarina, 2013/12/16 02:42:03]

Done.

[tfarina, 2013/12/16 02:42:03]

Done.

           ],
           # TODO(mark): We really want this for all non-static library
           # targets, but when we tried to pull it up to the common.gypi
           # level, it broke other things like the ui and startup tests. *shrug*
           'xcode_settings': {
             'OTHER_LDFLAGS': [
               '-Wl,-ObjC',
             ],
           },
           # Other platforms only need
@@ skipping 866 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
           ],
         }]
     }],
   ],  # 'conditions'
 }