ui/base/dragdrop/os_exchange_data_unittest.cc - Issue 117983002: Prefix string16 with base:: in ui/.

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: ui/base/dragdrop/os_exchange_data_unittest.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 7 years 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 side-by-side diff with in-line comments

Download patch

Index: ui/base/dragdrop/os_exchange_data_unittest.cc

diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc

index f2d243d5bdd1b2bc7213072fd7dd6c7760d8208f..81f33c82d75eb2d8cba3577eec319494819f8df1 100644

--- a/ui/base/dragdrop/os_exchange_data_unittest.cc

+++ b/ui/base/dragdrop/os_exchange_data_unittest.cc

@@ -19,16 +19,16 @@ class OSExchangeDataTest : public PlatformTest {

TEST_F(OSExchangeDataTest, StringDataGetAndSet) {

OSExchangeData data;

- string16 input = ASCIIToUTF16("I can has cheezburger?");

+ base::string16 input = ASCIIToUTF16("I can has cheezburger?");

data.SetString(input);

OSExchangeData data2(data.provider().Clone());

- string16 output;

+ base::string16 output;

EXPECT_TRUE(data2.GetString(&output));

EXPECT_EQ(input, output);

std::string url_spec = "http://www.goats.com/";

GURL url(url_spec);

- string16 title;

+ base::string16 title;

EXPECT_FALSE(data2.GetURLAndTitle(&url, &title));

// No URLs in |data|, so url should be untouched.

EXPECT_EQ(url_spec, url.spec());

@@ -38,19 +38,19 @@ TEST_F(OSExchangeDataTest, TestURLExchangeFormats) {

OSExchangeData data;

std::string url_spec = "http://www.google.com/";

GURL url(url_spec);

- string16 url_title = ASCIIToUTF16("www.google.com");

+ base::string16 url_title = ASCIIToUTF16("www.google.com");

data.SetURL(url, url_title);

- string16 output;

+ base::string16 output;

OSExchangeData data2(data.provider().Clone());

// URL spec and title should match

GURL output_url;

- string16 output_title;

+ base::string16 output_title;

EXPECT_TRUE(data2.GetURLAndTitle(&output_url, &output_title));

EXPECT_EQ(url_spec, output_url.spec());

EXPECT_EQ(url_title, output_title);

- string16 output_string;

+ base::string16 output_string;

// URL should be the raw text response

EXPECT_TRUE(data2.GetString(&output_string));

@@ -83,14 +83,14 @@ TEST_F(OSExchangeDataTest, TestPickledData) {

TEST_F(OSExchangeDataTest, TestHTML) {

OSExchangeData data;

GURL url("http://www.google.com/");

- string16 html = ASCIIToUTF16(

+ base::string16 html = ASCIIToUTF16(

"<HTML>\n<BODY>\n"

"bold. This is bold italic.\n"

"</BODY>\n</HTML>");

data.SetHtml(html, url);

OSExchangeData copy(data.provider().Clone());

- string16 read_html;

+ base::string16 read_html;

EXPECT_TRUE(copy.GetHtml(&read_html, &url));

EXPECT_EQ(html, read_html);

}

« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc ('k') | ui/base/ime/chromeos/character_composer.h » ('j') | no next file with comments »