| Index: chrome/browser/sync/engine/download_updates_command.cc
|
| diff --git a/chrome/browser/sync/engine/download_updates_command.cc b/chrome/browser/sync/engine/download_updates_command.cc
|
| index 102799703c69ef6669ba3b81ad9689293a3de3a3..0c378d80d4007247a5a9e39d0a3d1a15da4b85e9 100644
|
| --- a/chrome/browser/sync/engine/download_updates_command.cc
|
| +++ b/chrome/browser/sync/engine/download_updates_command.cc
|
| @@ -12,7 +12,6 @@
|
| #include "chrome/browser/sync/engine/syncproto.h"
|
| #include "chrome/browser/sync/syncable/directory_manager.h"
|
| #include "chrome/browser/sync/syncable/model_type_payload_map.h"
|
| -#include "chrome/common/chrome_switches.h"
|
|
|
| using syncable::ScopedDirLookup;
|
|
|
| @@ -27,7 +26,10 @@ using syncable::MODEL_TYPE_COUNT;
|
| using syncable::ModelTypeSet;
|
| using syncable::ModelTypeSetToString;
|
|
|
| -DownloadUpdatesCommand::DownloadUpdatesCommand() {}
|
| +DownloadUpdatesCommand::DownloadUpdatesCommand(
|
| + bool create_mobile_bookmarks_folder)
|
| + : create_mobile_bookmarks_folder_(create_mobile_bookmarks_folder) {}
|
| +
|
| DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
|
|
|
| SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
|
| @@ -39,10 +41,8 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
|
| ClientToServerMessage::GET_UPDATES);
|
| GetUpdatesMessage* get_updates =
|
| client_to_server_message.mutable_get_updates();
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kCreateMobileBookmarksFolder)) {
|
| - get_updates->set_include_syncable_bookmarks(true);
|
| - }
|
| + get_updates->set_create_mobile_bookmarks_folder(
|
| + create_mobile_bookmarks_folder_);
|
|
|
| ScopedDirLookup dir(session->context()->directory_manager(),
|
| session->context()->account_name());
|
|
|