Re-land: Roll gtest.

testing/gtest.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.
 
 {
   'includes': [
     'gtest.gypi',
   ],
   'targets': [
     {
       'target_name': 'gtest',
       'toolsets': ['host', 'target'],
       'type': 'static_library',
       'sources': [
         '<@(gtest_sources)',
       ],
       'include_dirs': [
-        'gtest',
-        'gtest/include',
+        'third_party/googletest/googletest',
+        'third_party/googletest/googletest/include',
       ],
       'dependencies': [
         'gtest_prod',
       ],
       'defines': [
         # In order to allow regex matches in gtest to be shared between Windows
         # and other systems, we tell gtest to always use it's internal engine.
         'GTEST_HAS_POSIX_RE=0',
         # Chrome doesn't support / require C++11, yet.
         'GTEST_LANG_CXX11=0',
       ],
       'all_dependent_settings': {
         'include_dirs': [
-          'gtest/include',
+          'third_party/googletest/googletest/include',  # So that gtest headers can find themselves.
         ],
         'defines': [
           'GTEST_HAS_POSIX_RE=0',
           'GTEST_LANG_CXX11=0',
         ],
       },
       'conditions': [
         ['OS == "mac" or OS == "ios"', {
           'sources': [
             'gtest_mac.h',
@@ skipping 111 matching lines @@
         'msvs_disabled_warnings': [4800],
       },
     },
     {
       'target_name': 'gtest_main',
       'type': 'static_library',
       'dependencies': [
         'gtest',
       ],
       'sources': [
-        'gtest/src/gtest_main.cc',
+        'third_party/googletest/googletest/src/gtest_main.cc',
       ],
     },
     {
       'target_name': 'gtest_prod',
       'toolsets': ['host', 'target'],
       'type': 'none',
       'sources': [
         'gtest/include/gtest/gtest_prod.h',
+        'third_party/googletest/googletest/include/gtest/gtest_prod.h',
       ],
     },
   ],
 }