Retry to checkin a version of gmock, modified to use our boost_tuple in VS2005.

testing/gtest.gyp

 # Copyright (c) 2009 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,
-  },
   'includes': [
     '../build/common.gypi',
   ],
   'targets': [
     {
       'target_name': 'gtest',
       'type': '<(library)',
       'msvs_guid': 'BFE8E2A7-3B3B-43B0-A994-3058B852DB8B',
       'sources': [
         'gtest/include/gtest/internal/gtest-death-test-internal.h',
@@ skipping 30 matching lines @@
         'gtest/include',
       ],
       'conditions': [
         [ 'OS == "mac"', { 'sources': [ 'platform_test_mac.mm' ] } ],
       ],
       'direct_dependent_settings': {
         'defines': [
           'UNIT_TEST',
         ],
         'include_dirs': [
-          'gtest',
-          'gtest/include',
+          'gtest/include',  # So that gtest headers can find themselves.
         ],
         'target_conditions': [
           ['_type=="executable"', {'test': 1}],
         ],
       },
     },
     {
       # Note that calling this "gtest_main" confuses the scons build,
       # which uses "_main" on scons files to produce special behavior.
       'target_name': 'gtestmain',
       'type': '<(library)',
       'dependencies': [
         'gtest',
       ],
       'sources': [
         'gtest/src/gtest_main.cc',
       ],
     },
   ],
 }