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

Unified Diff: sync/engine/sync_session_job_unittest.cc

Issue 12320027: Remove SyncSessionJob's location member (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 10 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 | « sync/engine/sync_session_job.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/sync_session_job_unittest.cc
diff --git a/sync/engine/sync_session_job_unittest.cc b/sync/engine/sync_session_job_unittest.cc
index f19ade82e69afadf0bae6035acb824ca215739c1..c9779cca88bdf0bc02fc71e9366af75b1f6c315c 100644
--- a/sync/engine/sync_session_job_unittest.cc
+++ b/sync/engine/sync_session_job_unittest.cc
@@ -109,7 +109,7 @@ class SyncSessionJobTest : public testing::Test {
TEST_F(SyncSessionJobTest, Clone) {
SyncSessionJob job1(SyncSessionJob::NUDGE, TimeTicks::Now(),
- NewLocalSession().Pass(), ConfigurationParams(), FROM_HERE);
+ NewLocalSession().Pass(), ConfigurationParams());
sessions::test_util::SimulateSuccess(job1.mutable_session(),
job1.start_step(),
@@ -118,17 +118,10 @@ TEST_F(SyncSessionJobTest, Clone) {
ModelSafeRoutingInfo new_routes;
new_routes[AUTOFILL] = GROUP_PASSIVE;
context()->set_routing_info(new_routes);
- const tracked_objects::Location from_here1(FROM_HERE);
scoped_ptr<SyncSessionJob> clone1 = job1.Clone();
- scoped_ptr<SyncSessionJob> clone1_loc = job1.CloneFromLocation(from_here1);
ExpectClonesBase(&job1, clone1.get());
- ExpectClonesBase(&job1, clone1_loc.get());
EXPECT_NE(job1.session(), clone1->session());
- EXPECT_EQ(job1.from_location().ToString(),
- clone1->from_location().ToString());
- EXPECT_NE(job1.session(), clone1_loc->session());
- EXPECT_EQ(from_here1.ToString(), clone1_loc->from_location().ToString());
context()->set_routing_info(routes());
clone1->GrantCanaryPrivilege();
@@ -136,34 +129,23 @@ TEST_F(SyncSessionJobTest, Clone) {
clone1->start_step(),
clone1->end_step());
clone1->Finish(false);
- const tracked_objects::Location from_here2(FROM_HERE);
scoped_ptr<SyncSessionJob> clone2 = clone1->Clone();
- scoped_ptr<SyncSessionJob> clone2_loc(clone1->CloneFromLocation(from_here2));
ExpectClonesBase(clone1.get(), clone2.get());
- ExpectClonesBase(clone1.get(), clone2_loc.get());
EXPECT_NE(clone1->session(), clone2->session());
- EXPECT_EQ(clone1->from_location().ToString(),
- clone2->from_location().ToString());
EXPECT_NE(clone1->session(), clone2->session());
- EXPECT_EQ(from_here2.ToString(), clone2_loc->from_location().ToString());
clone1.reset();
- clone1_loc.reset();
ExpectClonesBase(&job1, clone2.get());
EXPECT_NE(job1.session(), clone2->session());
- EXPECT_EQ(job1.from_location().ToString(),
- clone2->from_location().ToString());
}
TEST_F(SyncSessionJobTest, CloneAfterEarlyExit) {
SyncSessionJob job1(SyncSessionJob::NUDGE, TimeTicks::Now(),
- NewLocalSession().Pass(), ConfigurationParams(), FROM_HERE);
+ NewLocalSession().Pass(), ConfigurationParams());
job1.Finish(true);
scoped_ptr<SyncSessionJob> job2 = job1.Clone();
- scoped_ptr<SyncSessionJob> job2_loc = job1.CloneFromLocation(FROM_HERE);
ExpectClonesBase(&job1, job2.get());
- ExpectClonesBase(&job1, job2_loc.get());
}
TEST_F(SyncSessionJobTest, CloneAndAbandon) {
@@ -171,7 +153,7 @@ TEST_F(SyncSessionJobTest, CloneAndAbandon) {
SyncSession* session_ptr = session.get();
SyncSessionJob job1(SyncSessionJob::NUDGE, TimeTicks::Now(),
- session.Pass(), ConfigurationParams(), FROM_HERE);
+ session.Pass(), ConfigurationParams());
ModelSafeRoutingInfo new_routes;
new_routes[AUTOFILL] = GROUP_PASSIVE;
context()->set_routing_info(new_routes);
@@ -185,7 +167,7 @@ TEST_F(SyncSessionJobTest, CloneAndAbandon) {
// Tests interaction between Finish and sync cycle success / failure.
TEST_F(SyncSessionJobTest, Finish) {
SyncSessionJob job1(SyncSessionJob::NUDGE, TimeTicks::Now(),
- NewLocalSession().Pass(), ConfigurationParams(), FROM_HERE);
+ NewLocalSession().Pass(), ConfigurationParams());
sessions::test_util::SimulateSuccess(job1.mutable_session(),
job1.start_step(),
@@ -215,7 +197,7 @@ TEST_F(SyncSessionJobTest, FinishCallsReadyTask) {
new SyncSession(context(), delegate(), info));
SyncSessionJob job1(SyncSessionJob::CONFIGURATION, TimeTicks::Now(),
- session.Pass(), params, FROM_HERE);
+ session.Pass(), params);
sessions::test_util::SimulateSuccess(job1.mutable_session(),
job1.start_step(),
job1.end_step());
« no previous file with comments | « sync/engine/sync_session_job.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698