diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 05:55:07 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 05:55:07 +0000 |
| commit | 0724e82343ab19fca8afe92c57f0bd78df1fa567 (patch) | |
| tree | e6ddfc1207ede93faf6c8991071ae8b93944a05f /content | |
| parent | 47b375e2cabf0d953a4a342e7c51abc9a5afc926 (diff) | |
| download | chromium_src-0724e82343ab19fca8afe92c57f0bd78df1fa567.zip chromium_src-0724e82343ab19fca8afe92c57f0bd78df1fa567.tar.gz chromium_src-0724e82343ab19fca8afe92c57f0bd78df1fa567.tar.bz2 | |
Revert r135533.
It broke all content_unittests on mac in debug builds.
BUG=121135,126558
TEST=no stack dumps in content_unittests output on mac debug builds
TBR=varunjain
Review URL: https://chromiumcodereview.appspot.com/10386020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/test/DEPS | 4 | ||||
| -rw-r--r-- | content/test/content_test_suite.cc | 6 | ||||
| -rw-r--r-- | content/test/content_test_suite.h | 3 |
3 files changed, 2 insertions, 11 deletions
diff --git a/content/test/DEPS b/content/test/DEPS index f614bb5..1d02736 100644 --- a/content/test/DEPS +++ b/content/test/DEPS @@ -3,7 +3,5 @@ include_rules = [ # Testing utilities can access anything in content/ "+content", "+media/base", # For ChannelLayout in WebRTC tests. - "+ui/base/resource/data_pack.h", - # TODO(varunjain): remove this - "+ui/base/resource/resource_bundle.h", + "+ui/base/resource/data_pack.h" ] diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index 9c018e9..2007156 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -11,7 +11,6 @@ #include "content/test/test_content_client.h" #include "content/test/test_content_client_initializer.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #if defined(OS_MACOSX) @@ -72,10 +71,5 @@ void ContentTestSuite::Initialize() { testing::TestEventListeners& listeners = testing::UnitTest::GetInstance()->listeners(); listeners.Append(new TestInitializationListener); - ui::ResourceBundle::InitSharedInstanceWithLocale("en-US"); } -void ContentTestSuite::Shutdown() { - ui::ResourceBundle::CleanupSharedInstance(); - base::TestSuite::Shutdown(); -} diff --git a/content/test/content_test_suite.h b/content/test/content_test_suite.h index e3abdb7..6a2b948 100644 --- a/content/test/content_test_suite.h +++ b/content/test/content_test_suite.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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. @@ -17,7 +17,6 @@ class ContentTestSuite : public base::TestSuite { protected: virtual void Initialize() OVERRIDE; - virtual void Shutdown() OVERRIDE; private: base::win::ScopedCOMInitializer com_initializer_; |