Get rid of ui_cocoa_third_party_toolkits target from ui.gyp

remoting/remoting.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
 
     'variables': {
       'conditions': [
@@ skipping 478 matching lines @@
                 ],
               },
             }, {  # else OS != "linux"
               'sources!': [
                 'host/continue_window_aura.cc',
                 'host/disconnect_window_aura.cc',
               ],
             }],
             ['OS=="mac"', {
               'sources': [
-                '../third_party/GTM/AppKit/GTMCarbonEvent.h',
-                '../third_party/GTM/AppKit/GTMCarbonEvent.m',
-                '../third_party/GTM/DebugUtils/GTMDebugSelectorValidation.h',
-                '../third_party/GTM/DebugUtils/GTMTypeCasting.h',
-                '../third_party/GTM/Foundation/GTMObjectSingleton.h',
-                '../third_party/GTM/GTMDefines.h',
+                '../third_party/google_toolbox_for_mac/src/AppKit/GTMCarbonEvent.h',

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

Don’t do this. Add the sources to the GTM target and depend on that instead.

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

Done.

+                '../third_party/google_toolbox_for_mac/src/AppKit/GTMCarbonEvent.m',
+                '../third_party/google_toolbox_for_mac/src/DebugUtils/GTMDebugSelectorValidation.h',
+                '../third_party/google_toolbox_for_mac/src/DebugUtils/GTMTypeCasting.h',
+                '../third_party/google_toolbox_for_mac/src/Foundation/GTMObjectSingleton.h',
+                '../third_party/google_toolbox_for_mac/src/GTMDefines.h',
               ],
               'include_dirs': [
-                '../third_party/GTM',
-                '../third_party/GTM/AppKit',
-                '../third_party/GTM/DebugUtils',
-                '../third_party/GTM/Foundation',
+                '../third_party/google_toolbox_for_mac/src',
+                '../third_party/google_toolbox_for_mac/src/AppKit',
+                '../third_party/google_toolbox_for_mac/src/DebugUtils',
+                '../third_party/google_toolbox_for_mac/src/Foundation',
               ],
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
                   'libpam.a',
                ],
               },
             }],
             ['OS=="win"', {
               'defines': [
@@ skipping 2546 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }