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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_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/string16.h" 7 #include "base/strings/string16.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
14 #include "chrome/test/base/testing_profile.h" 14 #include "chrome/test/base/testing_profile.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #import "testing/gtest_mac.h" 16 #import "testing/gtest_mac.h"
17 #include "testing/platform_test.h" 17 #include "testing/platform_test.h"
18 18
19 using base::ASCIIToUTF16;
20
19 class BookmarkEditorControllerTest : public CocoaProfileTest { 21 class BookmarkEditorControllerTest : public CocoaProfileTest {
20 public: 22 public:
21 const BookmarkNode* default_node_; 23 const BookmarkNode* default_node_;
22 const BookmarkNode* default_parent_; 24 const BookmarkNode* default_parent_;
23 const char* default_name_; 25 const char* default_name_;
24 base::string16 default_title_; 26 base::string16 default_title_;
25 BookmarkEditorController* controller_; 27 BookmarkEditorController* controller_;
26 28
27 virtual void SetUp() OVERRIDE { 29 virtual void SetUp() OVERRIDE {
28 CocoaProfileTest::SetUp(); 30 CocoaProfileTest::SetUp();
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 472
471 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) { 473 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) {
472 [controller_ setDisplayName:@"NEW BOOKMARK"]; 474 [controller_ setDisplayName:@"NEW BOOKMARK"];
473 [controller_ setDisplayURL:@"http://NEWURL.com"]; 475 [controller_ setDisplayURL:@"http://NEWURL.com"];
474 [controller_ ok:nil]; 476 [controller_ ok:nil];
475 const BookmarkNode* new_node = folder_bb_->GetChild(5); 477 const BookmarkNode* new_node = folder_bb_->GetChild(5);
476 ASSERT_EQ(0, new_node->child_count()); 478 ASSERT_EQ(0, new_node->child_count());
477 EXPECT_EQ(new_node->GetTitle(), ASCIIToUTF16("NEW BOOKMARK")); 479 EXPECT_EQ(new_node->GetTitle(), ASCIIToUTF16("NEW BOOKMARK"));
478 EXPECT_EQ(new_node->url(), GURL("http://NEWURL.com")); 480 EXPECT_EQ(new_node->url(), GURL("http://NEWURL.com"));
479 } 481 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698