diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 18:18:36 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 18:18:36 +0000 |
| commit | dbbad7a3197d145cd1619b6f558c96b88c44c4ba (patch) | |
| tree | 549af131c5d56461819482fa0ab86a921b81cc12 /chrome/browser/cocoa/applescript | |
| parent | 4fc9af494614b7df215e492f42e788c575045103 (diff) | |
| download | chromium_src-dbbad7a3197d145cd1619b6f558c96b88c44c4ba.zip chromium_src-dbbad7a3197d145cd1619b6f558c96b88c44c4ba.tar.gz chromium_src-dbbad7a3197d145cd1619b6f558c96b88c44c4ba.tar.bz2 | |
FBTF: Forward declare everything possible in testing_profile.h
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3129007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/applescript')
| -rw-r--r-- | chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.h | 17 | ||||
| -rw-r--r-- | chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm | 17 |
2 files changed, 21 insertions, 13 deletions
diff --git a/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.h index c3d6e83..d35d1e9 100644 --- a/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.h +++ b/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.h @@ -17,6 +17,8 @@ #include "chrome/test/model_test_utils.h" #include "testing/platform_test.h" +class BookmarkModel; + // The fake object that acts as our app's delegate, useful for testing purposes. @interface FakeAppDelegate : AppController { @public @@ -39,24 +41,13 @@ // The base class for all our bookmark releated unit tests. class BookmarkAppleScriptTest : public CocoaTest { public: - BookmarkAppleScriptTest() { - appDelegate_.reset([[FakeAppDelegate alloc] init]); - [appDelegate_.get() setHelper:&helper_]; - [NSApp setDelegate:appDelegate_]; - const BookmarkNode* root = model().GetBookmarkBarNode(); - const std::wstring modelString(L"a f1:[ b d c ] d f2:[ e f g ] h "); - model_test_utils::AddNodesFromModelString(model(), root, modelString); - bookmarkBar_.reset([[BookmarkFolderAppleScript alloc] - initWithBookmarkNode:model().GetBookmarkBarNode()]); - } + BookmarkAppleScriptTest(); private: BrowserTestHelper helper_; scoped_nsobject<FakeAppDelegate> appDelegate_; protected: scoped_nsobject<BookmarkFolderAppleScript> bookmarkBar_; - BookmarkModel& model() { - return *helper_.profile()->GetBookmarkModel(); - } + BookmarkModel& model(); }; #endif diff --git a/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm b/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm index 5616774..3323dc7 100644 --- a/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm +++ b/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm @@ -4,6 +4,8 @@ #import "chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.h" +#include "chrome/browser/bookmarks/bookmark_model.h" + @implementation FakeAppDelegate @synthesize helper = helper_; @@ -43,3 +45,18 @@ static FakeScriptCommand* kFakeCurrentCommand; } @end + +BookmarkAppleScriptTest::BookmarkAppleScriptTest() { + appDelegate_.reset([[FakeAppDelegate alloc] init]); + [appDelegate_.get() setHelper:&helper_]; + [NSApp setDelegate:appDelegate_]; + const BookmarkNode* root = model().GetBookmarkBarNode(); + const std::wstring modelString(L"a f1:[ b d c ] d f2:[ e f g ] h "); + model_test_utils::AddNodesFromModelString(model(), root, modelString); + bookmarkBar_.reset([[BookmarkFolderAppleScript alloc] + initWithBookmarkNode:model().GetBookmarkBarNode()]); +} + +BookmarkModel& BookmarkAppleScriptTest::model() { + return *helper_.profile()->GetBookmarkModel(); +} |
