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

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

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | 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 #include "base/mac/scoped_nsobject.h" 5 #include "base/mac/scoped_nsobject.h"
6 #include "base/strings/string16.h" 6 #include "base/strings/string16.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_test_helpers.h" 10 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 [[[mock_controller stub] andReturnValue:OCMOCK_VALUE(model)] bookmarkModel]; 119 [[[mock_controller stub] andReturnValue:OCMOCK_VALUE(model)] bookmarkModel];
120 return [mock_controller retain]; 120 return [mock_controller retain];
121 } 121 }
122 122
123 id GetMockButton(id mock_controller) { 123 id GetMockButton(id mock_controller) {
124 BookmarkModel* bookmark_model = 124 BookmarkModel* bookmark_model =
125 BookmarkModelFactory::GetForProfile(profile()); 125 BookmarkModelFactory::GetForProfile(profile());
126 const BookmarkNode* node = 126 const BookmarkNode* node =
127 bookmark_model->AddURL(bookmark_model->bookmark_bar_node(), 127 bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),
128 0, 128 0,
129 ASCIIToUTF16("Test Bookmark"), 129 base::ASCIIToUTF16("Test Bookmark"),
130 GURL("http://www.exmaple.com")); 130 GURL("http://www.exmaple.com"));
131 131
132 id mock_button = [OCMockObject mockForClass:[BookmarkButton class]]; 132 id mock_button = [OCMockObject mockForClass:[BookmarkButton class]];
133 [[[mock_button stub] andReturnValue:OCMOCK_VALUE(node)] bookmarkNode]; 133 [[[mock_button stub] andReturnValue:OCMOCK_VALUE(node)] bookmarkNode];
134 return [mock_button retain]; 134 return [mock_button retain];
135 } 135 }
136 136
137 base::scoped_nsobject<id> mock_controller_; 137 base::scoped_nsobject<id> mock_controller_;
138 base::scoped_nsobject<BookmarkBarFolderView> view_; 138 base::scoped_nsobject<BookmarkBarFolderView> view_;
139 base::scoped_nsobject<id> mock_button_; 139 base::scoped_nsobject<id> mock_button_;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 mock_controller_.reset(GetMockController( 203 mock_controller_.reset(GetMockController(
204 NO, BookmarkModelFactory::GetForProfile(profile()))); 204 NO, BookmarkModelFactory::GetForProfile(profile())));
205 [view_ setController:mock_controller_]; 205 [view_ setController:mock_controller_];
206 [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone] 206 [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
207 draggingEntered:drag_info]; 207 draggingEntered:drag_info];
208 EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove); 208 EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);
209 EXPECT_FALSE([view_ dropIndicatorShown]); 209 EXPECT_FALSE([view_ dropIndicatorShown]);
210 } 210 }
211 211
212 } // namespace 212 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698