Update gtest to 786564fa4a3c, switch to googlemock in 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',
+        'gtest/googletest',
+        'gtest/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',
@@ skipping 122 matching lines @@
               'GTEST_HAS_TR1_TUPLE=1',
             ],
           },
         }],
       ],
       'direct_dependent_settings': {
         'defines': [
           'UNIT_TEST',
         ],
         'include_dirs': [
-          'gtest/include',  # So that gtest headers can find themselves.
+          'gtest/googletest/include',  # So that gtest headers can find themselves.
         ],
         'target_conditions': [
           ['_type=="executable"', {
             'test': 1,
             'conditions': [
               ['OS=="mac"', {
                 'run_as': {
                   'action????': ['${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}'],
                 },
               }],
@@ skipping 27 matching lines @@
         ]
       },
     },
     {
       'target_name': 'gtest_main',
       'type': 'static_library',
       'dependencies': [
         'gtest',
       ],
       'sources': [
-        'gtest/src/gtest_main.cc',
+        'gtest/googletest/src/gtest_main.cc',
       ],
     },
     {
       'target_name': 'gtest_prod',
       'toolsets': ['host', 'target'],
       'type': 'none',
       'sources': [
-        'gtest/include/gtest/gtest_prod.h',
+        'gtest/googletest/include/gtest/googletest/gtest_prod.h',
       ],
     },
   ],
 }