diff options
| author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 06:45:50 +0000 |
|---|---|---|
| committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 06:45:50 +0000 |
| commit | 62df0a016209f927a61b76cf85f98c68aeea141f (patch) | |
| tree | 82e5496428285c4a40203bb95e24d201b97e3f35 /content/test/content_test_suite.cc | |
| parent | 08bfdd6d84eba3f87af54ab14a761d0000f76da5 (diff) | |
| download | chromium_src-62df0a016209f927a61b76cf85f98c68aeea141f.zip chromium_src-62df0a016209f927a61b76cf85f98c68aeea141f.tar.gz chromium_src-62df0a016209f927a61b76cf85f98c68aeea141f.tar.bz2 | |
Revert 112249 - [Mac] Move ScopedSendingEvent from content/common/mac to base/mac.
Also merge content/ MockCrControlApp into base/ MockCrApp.
BUG=102224
Review URL: http://codereview.chromium.org/8724004
TBR=shess@chromium.org
Review URL: http://codereview.chromium.org/8762020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_suite.cc')
| -rw-r--r-- | content/test/content_test_suite.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index 7a87809..c67f10a 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -17,6 +17,7 @@ #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" +#include "content/test/mock_chrome_application_mac.h" #endif namespace { @@ -67,6 +68,7 @@ ContentTestSuite::~ContentTestSuite() { void ContentTestSuite::Initialize() { #if defined(OS_MACOSX) base::mac::ScopedNSAutoreleasePool autorelease_pool; + mock_cr_app::RegisterMockCrControlApp(); #endif base::TestSuite::Initialize(); |