summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 01:18:29 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 01:18:29 +0000
commita366880f8475fa9e0e70ace062af10654b297574 (patch)
tree5c2a777d77feebefc4b8c0f0c78525d57be93b16 /app
parentc811184533d882af419cab0dabe0bf317c6c985f (diff)
downloadchromium_src-a366880f8475fa9e0e70ace062af10654b297574.zip
chromium_src-a366880f8475fa9e0e70ace062af10654b297574.tar.gz
chromium_src-a366880f8475fa9e0e70ace062af10654b297574.tar.bz2
Remove CrApplication dependency from base
Add a @protocol CrAppProtocol that clients of base must implement in their NSApplication subclass, and let base depend only on this protocol. Let MessagePumpNSApplication::DoRun() no longer initialize NSApplication (fixes a TODO). Add a MockCrApplication that the simple unittests in base and app can use, move chrome_application to chrome/common. Test shell might run nested run loops, so I gave it a real but simplified CrAppProtocol implementation. BUG=62968,46929 TEST=Everything still works. The PDF plugin prints one fewer warning when loaded. Review URL: http://codereview.chromium.org/5950003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/animation_container_unittest.cc4
-rw-r--r--app/test_suite.h6
2 files changed, 8 insertions, 2 deletions
diff --git a/app/animation_container_unittest.cc b/app/animation_container_unittest.cc
index 5375fc7..5aa3be6 100644
--- a/app/animation_container_unittest.cc
+++ b/app/animation_container_unittest.cc
@@ -109,13 +109,13 @@ TEST_F(AnimationContainerTest, Observer) {
animation1.Start();
EXPECT_TRUE(container->is_running());
- // Run the message loop the delegate quits the message loop when notified.
+ // Run the message loop. The delegate quits the message loop when notified.
MessageLoop::current()->Run();
// The timer should have finished.
EXPECT_TRUE(delegate1.finished());
- // And the container should no longer be runnings.
+ // And the container should no longer be running.
EXPECT_FALSE(container->is_running());
container->set_observer(NULL);
diff --git a/app/test_suite.h b/app/test_suite.h
index 7e9076c..1f05e13 100644
--- a/app/test_suite.h
+++ b/app/test_suite.h
@@ -13,6 +13,7 @@
#include "base/path_service.h"
#if defined(OS_MACOSX)
#include "base/mac_util.h"
+#include "base/test/mock_chrome_application_mac.h"
#endif
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/test/test_suite.h"
@@ -25,6 +26,11 @@ class AppTestSuite : public base::TestSuite {
protected:
virtual void Initialize() {
+#if defined(OS_MACOSX)
+ // Some of the app unit tests try to open windows.
+ mock_cr_app::RegisterMockCrApp();
+#endif
+
base::mac::ScopedNSAutoreleasePool autorelease_pool;
TestSuite::Initialize();