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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_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 #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"
11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
13 #include "chrome/test/base/test_browser_window.h" 13 #include "chrome/test/base/test_browser_window.h"
14 #include "chrome/test/base/testing_profile.h" 14 #include "chrome/test/base/testing_profile.h"
15 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #import "testing/gtest_mac.h" 17 #import "testing/gtest_mac.h"
18 #include "testing/platform_test.h" 18 #include "testing/platform_test.h"
19 #include "ui/base/l10n/l10n_util_mac.h" 19 #include "ui/base/l10n/l10n_util_mac.h"
20 20
21 using base::ASCIIToUTF16;
22
21 class BookmarkEditorBaseControllerTest : public CocoaProfileTest { 23 class BookmarkEditorBaseControllerTest : public CocoaProfileTest {
22 public: 24 public:
23 BookmarkEditorBaseController* controller_; // weak 25 BookmarkEditorBaseController* controller_; // weak
24 const BookmarkNode* folder_a_; 26 const BookmarkNode* folder_a_;
25 const BookmarkNode* folder_b_; 27 const BookmarkNode* folder_b_;
26 const BookmarkNode* folder_b_0_; 28 const BookmarkNode* folder_b_0_;
27 const BookmarkNode* folder_b_3_; 29 const BookmarkNode* folder_b_3_;
28 const BookmarkNode* folder_c_; 30 const BookmarkNode* folder_c_;
29 31
30 void CreateModel() { 32 void CreateModel() {
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 reinterpret_cast<const BookmarkNode*>(&children); 267 reinterpret_cast<const BookmarkNode*>(&children);
266 BookmarkFolderInfo* info = 268 BookmarkFolderInfo* info =
267 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" 269 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
268 folderNode:fakeNode 270 folderNode:fakeNode
269 children:children]; 271 children:children];
270 EXPECT_TRUE(info); 272 EXPECT_TRUE(info);
271 EXPECT_EQ([info folderName], @"name"); 273 EXPECT_EQ([info folderName], @"name");
272 EXPECT_EQ([info children], children); 274 EXPECT_EQ([info children], children);
273 EXPECT_EQ([info folderNode], fakeNode); 275 EXPECT_EQ([info folderNode], fakeNode);
274 } 276 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698