Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

chrome/browser/sync/engine/download_updates_command.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/engine/download_updates_command.h"
 
 #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;
 
 namespace browser_sync {
 using sessions::StatusController;
 using sessions::SyncSession;
 using std::string;
 using syncable::FIRST_REAL_MODEL_TYPE;
 using syncable::MODEL_TYPE_COUNT;
 
 DownloadUpdatesCommand::DownloadUpdatesCommand() {}
 DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
 
 void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
   ClientToServerMessage client_to_server_message;
   ClientToServerResponse update_response;
 
   client_to_server_message.set_share(session->context()->account_name());
   client_to_server_message.set_message_contents(
       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);
+  }
 
   ScopedDirLookup dir(session->context()->directory_manager(),
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
     return;
   }
 
   // Request updates for all enabled types.
   syncable::ModelTypeBitSet enabled_types;
@@ skipping 68 matching lines @@
     if (target_datatypes[i]) {
       requested_type_count++;
       syncable::AddDefaultExtensionValue(syncable::ModelTypeFromInt(i),
                                          filter_protobuf);
     }
   }
   DCHECK_LT(0, requested_type_count) << "Doing GetUpdates with empty filter.";
 }
 
 }  // namespace browser_sync