[Sync] Remove --create-mobile-bookmarks-folder

chrome/browser/sync/engine/download_updates_command.cc

 // Copyright (c) 2012 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/model_type_payload_map.h"
 #include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/common/chrome_switches.h"
 
 using sync_pb::DebugInfo;
 
 namespace browser_sync {
 using sessions::StatusController;
 using sessions::SyncSession;
 using std::string;
 using syncable::FIRST_REAL_MODEL_TYPE;
 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) {
   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::kCreateMobileBookmarksFolder)) {
-    get_updates->set_include_syncable_bookmarks(true);
-  }
+  get_updates->set_create_mobile_bookmarks_folder(
+      create_mobile_bookmarks_folder_);
 
   syncable::Directory* dir = session->context()->directory();
 
   // Request updates for all enabled types.
   const ModelTypeSet enabled_types =
       GetRoutingInfoTypes(session->routing_info());
   DVLOG(1) << "Getting updates for types "
            << ModelTypeSetToString(enabled_types);
   DCHECK(!enabled_types.Empty());
 
@@ skipping 67 matching lines @@
     if (session->context()->debug_info_getter()) {
       session->context()->debug_info_getter()->GetAndClearDebugInfo(
           debug_info);
     }
     session->mutable_status_controller()->set_debug_info_sent();
   }
 }
 
 
 }  // namespace browser_sync