Chromium Code Reviews| 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/strings/sys_string_conversions.h" | 7 #include "base/strings/sys_string_conversions.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" | 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 EXPECT_TRUE([controller_ window]); | 93 EXPECT_TRUE([controller_ window]); |
| 94 [controller_ runAsModalSheet]; | 94 [controller_ runAsModalSheet]; |
| 95 } | 95 } |
| 96 | 96 |
| 97 void TearDown() override { | 97 void TearDown() override { |
| 98 controller_ = NULL; | 98 controller_ = NULL; |
| 99 CocoaTest::TearDown(); | 99 CocoaTest::TearDown(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 Browser* CreateBrowser() override { | 102 Browser* CreateBrowser() override { |
| 103 Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop()); | 103 Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop()); |
|
msw
2015/07/09 22:37:37
nit: s/native_params/params/ for a one-liner below
xdai1
2015/07/09 23:45:40
Done.
| |
| 104 return chrome::CreateBrowserWithTestWindowForParams(&native_params); | 104 return chrome::CreateBrowserWithTestWindowForParams(&native_params) |
| 105 .release(); | |
| 105 } | 106 } |
| 106 }; | 107 }; |
| 107 | 108 |
| 108 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) { | 109 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) { |
| 109 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); | 110 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); |
| 110 const BookmarkNode* root = model->bookmark_bar_node(); | 111 const BookmarkNode* root = model->bookmark_bar_node(); |
| 111 EXPECT_EQ(4, root->child_count()); | 112 EXPECT_EQ(4, root->child_count()); |
| 112 // a | 113 // a |
| 113 const BookmarkNode* child = root->GetChild(0); | 114 const BookmarkNode* child = root->GetChild(0); |
| 114 EXPECT_EQ(3, child->child_count()); | 115 EXPECT_EQ(3, child->child_count()); |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 270 reinterpret_cast<const BookmarkNode*>(&children); | 271 reinterpret_cast<const BookmarkNode*>(&children); |
| 271 BookmarkFolderInfo* info = | 272 BookmarkFolderInfo* info = |
| 272 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" | 273 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" |
| 273 folderNode:fakeNode | 274 folderNode:fakeNode |
| 274 children:children]; | 275 children:children]; |
| 275 EXPECT_TRUE(info); | 276 EXPECT_TRUE(info); |
| 276 EXPECT_EQ([info folderName], @"name"); | 277 EXPECT_EQ([info folderName], @"name"); |
| 277 EXPECT_EQ([info children], children); | 278 EXPECT_EQ([info children], children); |
| 278 EXPECT_EQ([info folderNode], fakeNode); | 279 EXPECT_EQ([info folderNode], fakeNode); |
| 279 } | 280 } |
| OLD | NEW |