| 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 f97ae980cb0a797c28f9d7ce5bd7fea73860a6d2..f0ceb30b12d9da87f1521a92e517a36f0b7d2325 100644
|
| --- a/chrome/browser/sync/engine/download_updates_command.cc
|
| +++ b/chrome/browser/sync/engine/download_updates_command.cc
|
| @@ -6,13 +6,11 @@
|
|
|
| #include <string>
|
|
|
| -#include "base/command_line.h"
|
| #include "chrome/browser/sync/engine/syncer.h"
|
| #include "chrome/browser/sync/engine/syncer_proto_util.h"
|
| #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;
|
|
|
| @@ -37,10 +35,8 @@ void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
|
| ClientToServerMessage::GET_UPDATES);
|
| GetUpdatesMessage* get_updates =
|
| client_to_server_message.mutable_get_updates();
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableSyncedBookmarksFolder)) {
|
| - get_updates->set_include_syncable_bookmarks(true);
|
| - }
|
| + // TODO: make this default to true.
|
| + get_updates->set_include_syncable_bookmarks(true);
|
|
|
| ScopedDirLookup dir(session->context()->directory_manager(),
|
| session->context()->account_name());
|
|
|