summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 15:42:48 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 15:42:48 +0000
commit546796ec8f5fc19b569c36b74f0c9f2cc5b99a9d (patch)
tree435fcf4a01bce5825bb7e3419e6f5afa52bba5e7 /build
parent4b4ac55fc2da8952c24784a004dfd46496f8ae80 (diff)
downloadchromium_src-546796ec8f5fc19b569c36b74f0c9f2cc5b99a9d.zip
chromium_src-546796ec8f5fc19b569c36b74f0c9f2cc5b99a9d.tar.gz
chromium_src-546796ec8f5fc19b569c36b74f0c9f2cc5b99a9d.tar.bz2
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: svn://svn.chromium.org/chrome/trunk/src@75273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/temp_gyp/googleurl.gyp3
-rw-r--r--build/temp_gyp/googleurl_test_main.cc22
2 files changed, 1 insertions, 24 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index d4f3a37..9a2eda3 100644
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/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"', {
diff --git a/build/temp_gyp/googleurl_test_main.cc b/build/temp_gyp/googleurl_test_main.cc
deleted file mode 100644
index aecf095..0000000
--- a/build/temp_gyp/googleurl_test_main.cc
+++ /dev/null
@@ -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();
-}