diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 09:43:16 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 09:43:16 +0000 |
| commit | 7b73bbc974ff74e28aecdad6cbf10b43d99a29e3 (patch) | |
| tree | e144e1a6dc7326656ea2bdc88108e3e5263aec5d /content | |
| parent | baa0e34f39f96dd52ff7421c3d4058a663f14d38 (diff) | |
| download | chromium_src-7b73bbc974ff74e28aecdad6cbf10b43d99a29e3.zip chromium_src-7b73bbc974ff74e28aecdad6cbf10b43d99a29e3.tar.gz chromium_src-7b73bbc974ff74e28aecdad6cbf10b43d99a29e3.tar.bz2 | |
Aura: Adds custom cursors for drag and drop.
BUG=121135
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=135378
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=135426
Review URL: http://codereview.chromium.org/10316019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135533 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, 11 insertions, 2 deletions
diff --git a/content/test/DEPS b/content/test/DEPS index 1d02736..f614bb5 100644 --- a/content/test/DEPS +++ b/content/test/DEPS @@ -3,5 +3,7 @@ include_rules = [ # Testing utilities can access anything in content/ "+content", "+media/base", # For ChannelLayout in WebRTC tests. - "+ui/base/resource/data_pack.h" + "+ui/base/resource/data_pack.h", + # TODO(varunjain): remove this + "+ui/base/resource/resource_bundle.h", ] diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index a81b816b..657415a 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -11,6 +11,7 @@ #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) @@ -71,5 +72,10 @@ 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 6a2b948..e3abdb7 100644 --- a/content/test/content_test_suite.h +++ b/content/test/content_test_suite.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -17,6 +17,7 @@ class ContentTestSuite : public base::TestSuite { protected: virtual void Initialize() OVERRIDE; + virtual void Shutdown() OVERRIDE; private: base::win::ScopedCOMInitializer com_initializer_; |