chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc - Issue 1172183002: Move StartsWith[ASCII] to base namespace.

Unified Diff: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

Issue 1172183002: Move StartsWith[ASCII] to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@string_util3

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

Download patch

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_url_filter.cc ('k') | chrome/browser/sync/test/integration/extensions_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

index bc0ba5947b992bab8440c0dc9b37c4fa6a5d7c37..c11c8d9436fb1dead4c8aa57590df224ef9d9b8f 100644

--- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

+++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

@@ -1010,8 +1010,8 @@ TEST_F(SessionsSyncManagerTest, MergeWithLocalAndForeignTabs) {

for (int i = 1; i < 3; i++) {

EXPECT_TRUE(output[i].IsValid());

const SyncData data(output[i].sync_data());

- EXPECT_TRUE(StartsWithASCII(syncer::SyncDataLocal(data).GetTag(),

- manager()->current_machine_tag(), true));

+ EXPECT_TRUE(base::StartsWithASCII(syncer::SyncDataLocal(data).GetTag(),

+ manager()->current_machine_tag(), true));

const sync_pb::SessionSpecifics& specifics(data.GetSpecifics().session());

EXPECT_EQ(manager()->current_machine_tag(), specifics.session_tag());

}

@@ -1444,17 +1444,15 @@ TEST_F(SessionsSyncManagerTest, AssociateWindowsDontReloadTabs) {

EXPECT_EQ(3U, out.size()); // Tab add, update, and header update.

EXPECT_TRUE(

- StartsWithASCII(syncer::SyncDataLocal(out[0].sync_data()).GetTag(),

- manager()->current_machine_tag(),

- true));

+ base::StartsWithASCII(syncer::SyncDataLocal(out[0].sync_data()).GetTag(),

+ manager()->current_machine_tag(), true));

EXPECT_EQ(manager()->current_machine_tag(),

out[0].sync_data().GetSpecifics().session().session_tag());

EXPECT_EQ(SyncChange::ACTION_ADD, out[0].change_type());

EXPECT_TRUE(

- StartsWithASCII(syncer::SyncDataLocal(out[1].sync_data()).GetTag(),

- manager()->current_machine_tag(),

- true));

+ base::StartsWithASCII(syncer::SyncDataLocal(out[1].sync_data()).GetTag(),

+ manager()->current_machine_tag(), true));

EXPECT_EQ(manager()->current_machine_tag(),

out[1].sync_data().GetSpecifics().session().session_tag());

EXPECT_TRUE(out[1].sync_data().GetSpecifics().session().has_tab());

@@ -1508,8 +1506,8 @@ TEST_F(SessionsSyncManagerTest, OnLocalTabModified) {

SCOPED_TRACE(i);

EXPECT_TRUE(out[i].IsValid());

const SyncData data(out[i].sync_data());

- EXPECT_TRUE(StartsWithASCII(syncer::SyncDataLocal(data).GetTag(),

- manager()->current_machine_tag(), true));

+ EXPECT_TRUE(base::StartsWithASCII(syncer::SyncDataLocal(data).GetTag(),

+ manager()->current_machine_tag(), true));

const sync_pb::SessionSpecifics& specifics(data.GetSpecifics().session());

EXPECT_EQ(manager()->current_machine_tag(), specifics.session_tag());

if (i % 6 == 0) {

@@ -1616,8 +1614,8 @@ TEST_F(SessionsSyncManagerTest, MergeLocalSessionExistingTabs) {

for (int i = 1; i < 5; i++) {

EXPECT_TRUE(out[i].IsValid());

const SyncData data(out[i].sync_data());

- EXPECT_TRUE(StartsWithASCII(syncer::SyncDataLocal(data).GetTag(),

- manager()->current_machine_tag(), true));

+ EXPECT_TRUE(base::StartsWithASCII(syncer::SyncDataLocal(data).GetTag(),

+ manager()->current_machine_tag(), true));

const sync_pb::SessionSpecifics& specifics(data.GetSpecifics().session());

EXPECT_EQ(manager()->current_machine_tag(), specifics.session_tag());

if (i % 2 == 1) {