Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm

Issue 1662783002: Remove HostDesktopType from Browser::CreateParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-12
Patch Set: remove desktop_type_ in bookmark_bubble_sign_in_delegate Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 EXPECT_TRUE([controller_ window]); 94 EXPECT_TRUE([controller_ window]);
95 [controller_ runAsModalSheet]; 95 [controller_ runAsModalSheet];
96 } 96 }
97 97
98 void TearDown() override { 98 void TearDown() override {
99 controller_ = NULL; 99 controller_ = NULL;
100 CocoaTest::TearDown(); 100 CocoaTest::TearDown();
101 } 101 }
102 102
103 Browser* CreateBrowser() override { 103 Browser* CreateBrowser() override {
104 Browser::CreateParams params(profile(), chrome::GetActiveDesktop()); 104 Browser::CreateParams params(profile());
105 return chrome::CreateBrowserWithTestWindowForParams(&params).release(); 105 return chrome::CreateBrowserWithTestWindowForParams(&params).release();
106 } 106 }
107 }; 107 };
108 108
109 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) { 109 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) {
110 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); 110 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
111 const BookmarkNode* root = model->bookmark_bar_node(); 111 const BookmarkNode* root = model->bookmark_bar_node();
112 EXPECT_EQ(4, root->child_count()); 112 EXPECT_EQ(4, root->child_count());
113 // a 113 // a
114 const BookmarkNode* child = root->GetChild(0); 114 const BookmarkNode* child = root->GetChild(0);
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 reinterpret_cast<const BookmarkNode*>(&children); 271 reinterpret_cast<const BookmarkNode*>(&children);
272 BookmarkFolderInfo* info = 272 BookmarkFolderInfo* info =
273 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" 273 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
274 folderNode:fakeNode 274 folderNode:fakeNode
275 children:children]; 275 children:children];
276 EXPECT_TRUE(info); 276 EXPECT_TRUE(info);
277 EXPECT_EQ([info folderName], @"name"); 277 EXPECT_EQ([info folderName], @"name");
278 EXPECT_EQ([info children], children); 278 EXPECT_EQ([info children], children);
279 EXPECT_EQ([info folderNode], fakeNode); 279 EXPECT_EQ([info folderNode], fakeNode);
280 } 280 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698