| Index: sync/engine/commit.cc
|
| diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc
|
| index 5e3d72e1d96a7c9b0109e4a3898012f0abe7b9c3..66d0824fdd32c5a9ba31a3d17dfb96f460dbdd6f 100644
|
| --- a/sync/engine/commit.cc
|
| +++ b/sync/engine/commit.cc
|
| @@ -32,21 +32,20 @@ Commit::~Commit() {
|
| DCHECK(cleaned_up_);
|
| }
|
|
|
| -Commit* Commit::Init(
|
| - ModelTypeSet requested_types,
|
| - ModelTypeSet enabled_types,
|
| - size_t max_entries,
|
| - const std::string& account_name,
|
| - const std::string& cache_guid,
|
| - bool cookie_jar_mismatch,
|
| - CommitProcessor* commit_processor,
|
| - ExtensionsActivity* extensions_activity) {
|
| +Commit* Commit::Init(ModelTypeSet requested_types,
|
| + ModelTypeSet enabled_types,
|
| + size_t max_entries,
|
| + const std::string& account_name,
|
| + const std::string& cache_guid,
|
| + bool cookie_jar_mismatch,
|
| + bool cookie_jar_empty,
|
| + CommitProcessor* commit_processor,
|
| + ExtensionsActivity* extensions_activity) {
|
| // Gather per-type contributions.
|
| ContributionMap contributions;
|
| - commit_processor->GatherCommitContributions(
|
| - requested_types,
|
| - max_entries,
|
| - &contributions);
|
| + commit_processor->GatherCommitContributions(requested_types, max_entries,
|
| + cookie_jar_mismatch,
|
| + cookie_jar_empty, &contributions);
|
|
|
| // Give up if no one had anything to commit.
|
| if (contributions.empty())
|
|
|