Revert 75263 - Revert 75188 - Revert 75184 - Move googleurl's unittest to use a custom main so ICU can be started up in

a way that matches the Chromium build.
Review URL: http://codereview.chromium.org/6532003

TBR=thomasvl@chromium.org
Review URL: http://codereview.chromium.org/6507022

TBR=rsesek@chromium.org

TBR=thomasvl@chromium.org
Review URL: http://codereview.chromium.org/6538021

git-svn-id: http://src.chromium.org/svn/trunk/src/build@75273 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

temp_gyp/googleurl.gyp

@@ -69,7 +69,6 @@
     {
       'target_name': 'googleurl_unittests',
       'dependencies': [
-        '../../base/base.gyp:base_i18n',
         'googleurl',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/icu/icu.gyp:icuuc',
@@ -80,7 +79,7 @@
         '../../googleurl/src/url_parse_unittest.cc',
         '../../googleurl/src/url_test_utils.h',
         '../../googleurl/src/url_util_unittest.cc',
-        'googleurl_test_main.cc',
+        '../../googleurl/src/gurl_test_main.cc',
       ],
       'conditions': [
         ['OS=="linux" or OS=="freebsd"', {

temp_gyp/googleurl_test_main.cc

@@ -1,22 +0,0 @@
-// Copyright (c) 2011 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.
-
-// This is a replacement for ../../googleurl/src/gurl_test_main.cc.  The
-// unittest is being built for a Chromium tree, so ICU needs to be initialized
-// how the Chromium tree expects which is different than what is in the
-// GoogleURL version.
-
-#include "base/i18n/icu_util.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-int main(int argc, char** argv) {
-  base::mac::ScopedNSAutoreleasePool scoped_pool;
-
-  testing::InitGoogleTest(&argc, argv);
-
-  icu_util::Initialize();
-
-  return RUN_ALL_TESTS();
-}