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

chrome/browser/sync/engine/syncer.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/syncer.h"
 
 #include "base/debug/trace_event.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/sync/engine/apply_updates_command.h"
 #include "chrome/browser/sync/engine/build_commit_command.h"
 #include "chrome/browser/sync/engine/cleanup_disabled_types_command.h"
 #include "chrome/browser/sync/engine/clear_data_command.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/download_updates_command.h"
 #include "chrome/browser/sync/engine/get_commit_ids_command.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/post_commit_message_command.h"
 #include "chrome/browser/sync/engine/process_commit_response_command.h"
@@ skipping 112 matching lines @@
 
         next_step = CLEANUP_DISABLED_TYPES;
         break;
       case CLEANUP_DISABLED_TYPES: {
         CleanupDisabledTypesCommand cleanup;
         cleanup.Execute(session);
         next_step = DOWNLOAD_UPDATES;
         break;
       }
       case DOWNLOAD_UPDATES: {
-        DownloadUpdatesCommand download_updates;
+        // TODO(akalin): We may want to propagate this switch up
+        // eventually.
+#if defined(OS_ANDROID)
+        const bool kIncludeSyncableBookmarks = true;

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

You could start renaming this to kCreateMobileBookmarksFolder and propagating
that throughout. I assume it's also safe to rename the proto-field name, right?
(i.e. there's a unique id and the actual name isn't important)

[akalin, 2012/02/27 22:29:44]

Done.

+#else
+        const bool kIncludeSyncableBookmarks = false;
+#endif
+        DownloadUpdatesCommand download_updates(kIncludeSyncableBookmarks);
         session->mutable_status_controller()->set_last_download_updates_result(
             download_updates.Execute(session));
         next_step = PROCESS_CLIENT_COMMAND;
         break;
       }
       case PROCESS_CLIENT_COMMAND: {
         ProcessClientCommand(session);
         next_step = VERIFY_UPDATES;
         break;
       }
@@ skipping 188 matching lines @@
   entry->Put(SERVER_CTIME, Time());
   entry->Put(SERVER_VERSION, 0);
   entry->Put(SERVER_IS_DIR, false);
   entry->Put(SERVER_IS_DEL, false);
   entry->Put(IS_UNAPPLIED_UPDATE, false);
   entry->Put(SERVER_SPECIFICS, sync_pb::EntitySpecifics::default_instance());
   entry->Put(SERVER_POSITION_IN_PARENT, 0);
 }
 
 }  // namespace browser_sync