Merge 23965 - Pulling new version of googleurl into the tree....

build/temp_gyp/googleurl.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.
 
 # TODO(mark): Upstream this file to googleurl.
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
@@ skipping 44 matching lines @@
           '../..',
         ],
       },
     },
     {
       'target_name': 'googleurl_unittests',
       'type': 'executable',
       'dependencies': [
         'googleurl',
         '../../testing/gtest.gyp:gtest',
-        '../../testing/gtest.gyp:gtestmain',
         '../../third_party/icu38/icu38.gyp:icuuc',
       ],
       'sources': [
         '../../googleurl/src/gurl_unittest.cc',
         '../../googleurl/src/url_canon_unittest.cc',
         '../../googleurl/src/url_parse_unittest.cc',
         '../../googleurl/src/url_test_utils.h',
         '../../googleurl/src/url_util_unittest.cc',
+        '../../googleurl/src/gurl_test_main.cc',
       ],
     },
   ],
 }