summaryrefslogtreecommitdiffstats
path: root/base/mac
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 02:22:02 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 02:22:02 +0000
commita70b0a781ee5fb44a82887ed9e76e6a0d80d64e3 (patch)
tree6f44b79e43ea61783b12dd7849ac938f8f834d29 /base/mac
parente7a0a59da27a34bd0677b0f4b7862174f21e3027 (diff)
downloadchromium_src-a70b0a781ee5fb44a82887ed9e76e6a0d80d64e3.zip
chromium_src-a70b0a781ee5fb44a82887ed9e76e6a0d80d64e3.tar.gz
chromium_src-a70b0a781ee5fb44a82887ed9e76e6a0d80d64e3.tar.bz2
Cleanup base & app unit test MockCrApp NSApp initialization.
Provide chrome unit test CrApplication NSApp initialization. Chrome requires a legitimate message loop for its unit tests. Ensure that init occurs before the base class MockCrApp init. BUG=71686 TEST=Run all base/app/chrome unit tests on Mac; try bug repro Review URL: http://codereview.chromium.org/6349058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
-rw-r--r--base/mac/mac_util_unittest.mm4
1 files changed, 1 insertions, 3 deletions
diff --git a/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm
index 47ecebf..17fc04f 100644
--- a/base/mac/mac_util_unittest.mm
+++ b/base/mac/mac_util_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
@@ -10,7 +10,6 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/mac/scoped_cftyperef.h"
-#include "base/test/mock_chrome_application_mac.h"
#include "base/scoped_nsobject.h"
#include "base/scoped_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -55,7 +54,6 @@ TEST_F(MacUtilTest, TestLibraryPath) {
TEST_F(MacUtilTest, TestGrabWindowSnapshot) {
// Launch a test window so we can take a snapshot.
- [MockCrApp sharedApplication];
NSRect frame = NSMakeRect(0, 0, 400, 400);
scoped_nsobject<NSWindow> window(
[[NSWindow alloc] initWithContentRect:frame