summaryrefslogtreecommitdiffstats
path: root/content/test/content_test_suite.cc
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 18:18:45 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 18:18:45 +0000
commitd87aa8ef205f2665c9ab892573b0b82415a4133d (patch)
tree39ee940412494e27d1083ebb64b0d0eecacf528a /content/test/content_test_suite.cc
parent74c3b37588eb80346111b3fd72d6f7a51d55f627 (diff)
downloadchromium_src-d87aa8ef205f2665c9ab892573b0b82415a4133d.zip
chromium_src-d87aa8ef205f2665c9ab892573b0b82415a4133d.tar.gz
chromium_src-d87aa8ef205f2665c9ab892573b0b82415a4133d.tar.bz2
[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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_suite.cc')
-rw-r--r--content/test/content_test_suite.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index c67f10a..7a87809 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -17,7 +17,6 @@
#if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h"
-#include "content/test/mock_chrome_application_mac.h"
#endif
namespace {
@@ -68,7 +67,6 @@ ContentTestSuite::~ContentTestSuite() {
void ContentTestSuite::Initialize() {
#if defined(OS_MACOSX)
base::mac::ScopedNSAutoreleasePool autorelease_pool;
- mock_cr_app::RegisterMockCrControlApp();
#endif
base::TestSuite::Initialize();