chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm - Issue 6256010: Revert 72380 - Remove wstring from autocomplete....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm

Issue 6256010: Revert 72380 - Remove wstring from autocomplete.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 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:

Index: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm

===================================================================

--- chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm (revision 72383)

+++ chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm (working copy)

@@ -4,7 +4,6 @@

#import <Cocoa/Cocoa.h>

-#include "base/utf_string_conversions.h"

#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

#import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -33,7 +32,7 @@

// not enough room.

TEST_F(SelectedKeywordDecorationTest, UsesPartialKeywordIfNarrow) {

- const string16 kKeyword = ASCIIToUTF16("Engine");

+ const std::wstring kKeyword(L"Engine");

NSString* const kFullString = @"Search Engine:";

NSString* const kPartialString = @"Search En\u2026:"; // ellipses

Property changes on: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm

___________________________________________________________________

Added: svn:mergeinfo