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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/bookmarks/bookmark_model_unittest.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.cc ('k') | chrome/browser/bookmarks/bookmark_node_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_model_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 10ff1c30a7a94f3c6fc5790a35ad04c3d1ea8c34..cb6d20fc78c377448d3dc1ee7accb0f4c42c6e1d 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -308,7 +308,7 @@ TEST_F(BookmarkModelTest, InitialState) {
TEST_F(BookmarkModelTest, AddURL) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
const BookmarkNode* new_node = model_.AddURL(root, 0, title, url);
@@ -328,7 +328,7 @@ TEST_F(BookmarkModelTest, AddURL) {
TEST_F(BookmarkModelTest, AddURLWithUnicodeTitle) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(WideToUTF16(
+ const base::string16 title(WideToUTF16(
L"\u767e\u5ea6\u4e00\u4e0b\uff0c\u4f60\u5c31\u77e5\u9053"));
const GURL url("https://www.baidu.com/");
@@ -350,7 +350,7 @@ TEST_F(BookmarkModelTest, AddURLWithUnicodeTitle) {
TEST_F(BookmarkModelTest, AddURLWithWhitespaceTitle) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_whitespace_test_cases); ++i) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(
+ const base::string16 title(
ASCIIToUTF16(url_whitespace_test_cases[i].input_title));
const GURL url("http://foo.com");
@@ -366,7 +366,7 @@ TEST_F(BookmarkModelTest, AddURLWithWhitespaceTitle) {
TEST_F(BookmarkModelTest, AddURLToMobileBookmarks) {
const BookmarkNode* root = model_.mobile_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
const BookmarkNode* new_node = model_.AddURL(root, 0, title, url);
@@ -386,7 +386,7 @@ TEST_F(BookmarkModelTest, AddURLToMobileBookmarks) {
TEST_F(BookmarkModelTest, AddFolder) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const BookmarkNode* new_node = model_.AddFolder(root, 0, title);
AssertObserverCount(1, 0, 0, 0, 0, 0, 0, 0, 0);
@@ -410,7 +410,7 @@ TEST_F(BookmarkModelTest, AddFolder) {
TEST_F(BookmarkModelTest, AddFolderWithWhitespaceTitle) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(title_whitespace_test_cases); ++i) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(
+ const base::string16 title(
ASCIIToUTF16(title_whitespace_test_cases[i].input_title));
const BookmarkNode* new_node = model_.AddFolder(root, i, title);
@@ -425,7 +425,7 @@ TEST_F(BookmarkModelTest, AddFolderWithWhitespaceTitle) {
TEST_F(BookmarkModelTest, RemoveURL) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
model_.AddURL(root, 0, title, url);
ClearCounts();
@@ -446,7 +446,7 @@ TEST_F(BookmarkModelTest, RemoveFolder) {
ClearCounts();
// Add a URL as a child.
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
model_.AddURL(folder, 0, title, url);
@@ -468,7 +468,7 @@ TEST_F(BookmarkModelTest, RemoveAll) {
ClearCounts();
// Add a url to bookmark bar.
- string16 title(ASCIIToUTF16("foo"));
+ base::string16 title(ASCIIToUTF16("foo"));
GURL url("http://foo.com");
model_.AddURL(bookmark_bar_node, 0, title, url);
@@ -491,7 +491,7 @@ TEST_F(BookmarkModelTest, RemoveAll) {
TEST_F(BookmarkModelTest, SetTitle) {
const BookmarkNode* root = model_.bookmark_bar_node();
- string16 title(ASCIIToUTF16("foo"));
+ base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
const BookmarkNode* node = model_.AddURL(root, 0, title, url);
@@ -507,7 +507,7 @@ TEST_F(BookmarkModelTest, SetTitle) {
TEST_F(BookmarkModelTest, SetTitleWithWhitespace) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(title_whitespace_test_cases); ++i) {
const BookmarkNode* root = model_.bookmark_bar_node();
- string16 title(ASCIIToUTF16("dummy"));
+ base::string16 title(ASCIIToUTF16("dummy"));
const GURL url("http://foo.com");
const BookmarkNode* node = model_.AddURL(root, 0, title, url);
@@ -520,7 +520,7 @@ TEST_F(BookmarkModelTest, SetTitleWithWhitespace) {
TEST_F(BookmarkModelTest, SetURL) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
GURL url("http://foo.com");
const BookmarkNode* node = model_.AddURL(root, 0, title, url);
@@ -535,7 +535,7 @@ TEST_F(BookmarkModelTest, SetURL) {
TEST_F(BookmarkModelTest, SetDateAdded) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
GURL url("http://foo.com");
const BookmarkNode* node = model_.AddURL(root, 0, title, url);
@@ -550,7 +550,7 @@ TEST_F(BookmarkModelTest, SetDateAdded) {
TEST_F(BookmarkModelTest, Move) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
const BookmarkNode* node = model_.AddURL(root, 0, title, url);
const BookmarkNode* folder1 = model_.AddFolder(root, 0, ASCIIToUTF16("foo"));
@@ -577,7 +577,7 @@ TEST_F(BookmarkModelTest, Move) {
TEST_F(BookmarkModelTest, NonMovingMoveCall) {
const BookmarkNode* root = model_.bookmark_bar_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
const base::Time old_date(base::Time::Now() - base::TimeDelta::FromDays(1));
@@ -650,7 +650,7 @@ TEST_F(BookmarkModelTest, Copy) {
TEST_F(BookmarkModelTest, ParentForNewNodes) {
ASSERT_EQ(model_.bookmark_bar_node(), model_.GetParentForNewNodes());
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
model_.AddURL(model_.other_node(), 0, title, url);
@@ -661,7 +661,7 @@ TEST_F(BookmarkModelTest, ParentForNewNodes) {
TEST_F(BookmarkModelTest, ParentForNewMobileNodes) {
ASSERT_EQ(model_.bookmark_bar_node(), model_.GetParentForNewNodes());
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
model_.AddURL(model_.mobile_node(), 0, title, url);
@@ -759,7 +759,7 @@ TEST_F(BookmarkModelTest, GetMostRecentlyAddedNodeForURL) {
// Makes sure GetBookmarks removes duplicates.
TEST_F(BookmarkModelTest, GetBookmarksWithDups) {
const GURL url("http://foo.com/0");
- const string16 title(ASCIIToUTF16("blah"));
+ const base::string16 title(ASCIIToUTF16("blah"));
model_.AddURL(model_.bookmark_bar_node(), 0, title, url);
model_.AddURL(model_.bookmark_bar_node(), 1, title, url);
@@ -1053,7 +1053,7 @@ TEST_F(BookmarkModelTest, NodeVisibility) {
TEST_F(BookmarkModelTest, MobileNodeVisibileWithChildren) {
const BookmarkNode* root = model_.mobile_node();
- const string16 title(ASCIIToUTF16("foo"));
+ const base::string16 title(ASCIIToUTF16("foo"));
const GURL url("http://foo.com");
model_.AddURL(root, 0, title, url);
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.cc ('k') | chrome/browser/bookmarks/bookmark_node_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698