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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_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_all_tabs_controller.h" 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_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/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "testing/platform_test.h" 15 #include "testing/platform_test.h"
16 16
17 using base::ASCIIToUTF16;
18
17 @interface BookmarkAllTabsControllerOverride : BookmarkAllTabsController 19 @interface BookmarkAllTabsControllerOverride : BookmarkAllTabsController
18 @end 20 @end
19 21
20 @implementation BookmarkAllTabsControllerOverride 22 @implementation BookmarkAllTabsControllerOverride
21 23
22 - (void)UpdateActiveTabPairs { 24 - (void)UpdateActiveTabPairs {
23 ActiveTabsNameURLPairVector* activeTabPairsVector = 25 ActiveTabsNameURLPairVector* activeTabPairsVector =
24 [self activeTabPairsVector]; 26 [self activeTabPairsVector];
25 activeTabPairsVector->clear(); 27 activeTabPairsVector->clear();
26 activeTabPairsVector->push_back( 28 activeTabPairsVector->push_back(
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // OK button should always be enabled. 79 // OK button should always be enabled.
78 EXPECT_TRUE([controller_ okButtonEnabled]); 80 EXPECT_TRUE([controller_ okButtonEnabled]);
79 [controller_ selectTestNodeInBrowser:folder_a_]; 81 [controller_ selectTestNodeInBrowser:folder_a_];
80 [controller_ setDisplayName:@"ALL MY TABS"]; 82 [controller_ setDisplayName:@"ALL MY TABS"];
81 [controller_ ok:nil]; 83 [controller_ ok:nil];
82 EXPECT_EQ(4, folder_a_->child_count()); 84 EXPECT_EQ(4, folder_a_->child_count());
83 const BookmarkNode* folderChild = folder_a_->GetChild(3); 85 const BookmarkNode* folderChild = folder_a_->GetChild(3);
84 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS")); 86 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS"));
85 EXPECT_EQ(3, folderChild->child_count()); 87 EXPECT_EQ(3, folderChild->child_count());
86 } 88 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698