[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/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
-#include "chrome/common/chrome_switches.h"
 
 using syncable::ScopedDirLookup;
 
 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 include_syncable_bookmarks)
+    : include_syncable_bookmarks_(include_syncable_bookmarks) {}
+
 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_include_syncable_bookmarks(include_syncable_bookmarks_);

[Nicolas Zea, 2012/02/27 20:03:12]

So is this always included in the getupdates if it already exists? Since
presumably if we've synced some mobile bookmarks we want all clients to download
them.

[akalin, 2012/02/27 22:04:18]

I don't think so.  This was the behavior before but for some reason it was
reverted.  sky or yaron may know more about it.

[Yaron, 2012/02/27 22:15:01]

It's a misnomer. This flag tells the sync server to _create_ the mobile
permanent folder if it's not already created. If it's already been created then
anybody will retrieve it.

 
   ScopedDirLookup dir(session->context()->directory_manager(),
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
     return DIRECTORY_LOOKUP_FAILED;
   }
 
   // Request updates for all enabled types.
   const ModelTypeSet enabled_types =
@@ skipping 72 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