OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
6 | 6 |
7 #include "base/memory/scoped_nsobject.h" | 7 #include "base/memory/scoped_nsobject.h" |
8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 EXPECT_TRUE([controller_ window]); | 88 EXPECT_TRUE([controller_ window]); |
89 [controller_ runAsModalSheet]; | 89 [controller_ runAsModalSheet]; |
90 } | 90 } |
91 | 91 |
92 virtual void TearDown() OVERRIDE { | 92 virtual void TearDown() OVERRIDE { |
93 controller_ = NULL; | 93 controller_ = NULL; |
94 CocoaTest::TearDown(); | 94 CocoaTest::TearDown(); |
95 } | 95 } |
96 | 96 |
97 virtual Browser* CreateBrowser() OVERRIDE { | 97 virtual Browser* CreateBrowser() OVERRIDE { |
98 Browser::CreateParams native_params(profile(), | 98 Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop()); |
99 chrome::HOST_DESKTOP_TYPE_NATIVE); | |
100 return chrome::CreateBrowserWithTestWindowForParams(&native_params); | 99 return chrome::CreateBrowserWithTestWindowForParams(&native_params); |
101 } | 100 } |
102 }; | 101 }; |
103 | 102 |
104 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) { | 103 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) { |
105 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); | 104 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); |
106 const BookmarkNode* root = model->bookmark_bar_node(); | 105 const BookmarkNode* root = model->bookmark_bar_node(); |
107 EXPECT_EQ(4, root->child_count()); | 106 EXPECT_EQ(4, root->child_count()); |
108 // a | 107 // a |
109 const BookmarkNode* child = root->GetChild(0); | 108 const BookmarkNode* child = root->GetChild(0); |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 reinterpret_cast<const BookmarkNode*>(&children); | 265 reinterpret_cast<const BookmarkNode*>(&children); |
267 BookmarkFolderInfo* info = | 266 BookmarkFolderInfo* info = |
268 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" | 267 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" |
269 folderNode:fakeNode | 268 folderNode:fakeNode |
270 children:children]; | 269 children:children]; |
271 EXPECT_TRUE(info); | 270 EXPECT_TRUE(info); |
272 EXPECT_EQ([info folderName], @"name"); | 271 EXPECT_EQ([info folderName], @"name"); |
273 EXPECT_EQ([info children], children); | 272 EXPECT_EQ([info children], children); |
274 EXPECT_EQ([info folderNode], fakeNode); | 273 EXPECT_EQ([info folderNode], fakeNode); |
275 } | 274 } |
OLD | NEW |