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

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

Issue 114883004: Add base:: namespace to straggling string16s left in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: found more Created 7 years 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 | Annotate | Revision Log
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.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 model->AddURL(root, 3, ASCIIToUTF16("d"), GURL("http://d-0.com")); 68 model->AddURL(root, 3, ASCIIToUTF16("d"), GURL("http://d-0.com"));
69 } 69 }
70 70
71 virtual BookmarkEditorBaseController* CreateController() { 71 virtual BookmarkEditorBaseController* CreateController() {
72 return [[BookmarkEditorBaseController alloc] 72 return [[BookmarkEditorBaseController alloc]
73 initWithParentWindow:test_window() 73 initWithParentWindow:test_window()
74 nibName:@"BookmarkAllTabs" 74 nibName:@"BookmarkAllTabs"
75 profile:profile() 75 profile:profile()
76 parent:folder_b_0_ 76 parent:folder_b_0_
77 url:GURL() 77 url:GURL()
78 title:string16() 78 title:base::string16()
79 configuration:BookmarkEditor::SHOW_TREE]; 79 configuration:BookmarkEditor::SHOW_TREE];
80 } 80 }
81 81
82 virtual void SetUp() OVERRIDE { 82 virtual void SetUp() OVERRIDE {
83 CocoaProfileTest::SetUp(); 83 CocoaProfileTest::SetUp();
84 ASSERT_TRUE(profile()); 84 ASSERT_TRUE(profile());
85 85
86 CreateModel(); 86 CreateModel();
87 controller_ = CreateController(); 87 controller_ = CreateController();
88 EXPECT_TRUE([controller_ window]); 88 EXPECT_TRUE([controller_ window]);
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 reinterpret_cast<const BookmarkNode*>(&children); 265 reinterpret_cast<const BookmarkNode*>(&children);
266 BookmarkFolderInfo* info = 266 BookmarkFolderInfo* info =
267 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" 267 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
268 folderNode:fakeNode 268 folderNode:fakeNode
269 children:children]; 269 children:children];
270 EXPECT_TRUE(info); 270 EXPECT_TRUE(info);
271 EXPECT_EQ([info folderName], @"name"); 271 EXPECT_EQ([info folderName], @"name");
272 EXPECT_EQ([info children], children); 272 EXPECT_EQ([info children], children);
273 EXPECT_EQ([info folderNode], fakeNode); 273 EXPECT_EQ([info folderNode], fakeNode);
274 } 274 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698