[NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

components/sync_driver/glue/sync_backend_host_core.cc

 // Copyright 2013 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/glue/sync_backend_host_core.h"
+#include "components/sync_driver/glue/sync_backend_host_core.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/invalidation/public/invalidation_util.h"
 #include "components/invalidation/public/object_id_invalidation_map.h"
 #include "components/sync_driver/glue/sync_backend_registrar.h"
@@ skipping 171 matching lines @@
   debug_info_listener_ = debug_info_listener;
 
   // Track whether or not sync DB and preferences were in sync.
   SyncBackendInitState backend_init_state;
   if (has_sync_setup_completed_ && !restored_types.Empty()) {
     backend_init_state = SETUP_COMPLETED_FOUND_RESTORED_TYPES;
   } else if (has_sync_setup_completed_ && restored_types.Empty()) {
     backend_init_state = SETUP_COMPLETED_NO_RESTORED_TYPES;
   } else if (!has_sync_setup_completed_ && restored_types.Empty()) {
     backend_init_state = FIRST_SETUP_NO_RESTORED_TYPES;
-  } else { // (!has_sync_setup_completed_ && !restored_types.Empty())
+  } else {  // (!has_sync_setup_completed_ && !restored_types.Empty())
     backend_init_state = FIRST_SETUP_RESTORED_TYPES;
   }
 
   UMA_HISTOGRAM_ENUMERATION("Sync.BackendInitializeRestoreState",
                             backend_init_state,
                             SYNC_BACKEND_INIT_STATE_COUNT);
 
   // Before proceeding any further, we need to download the control types and
   // purge any partial data (ie. data downloaded for a type that was on its way
   // to being initially synced, but didn't quite make it.).  The following
@@ skipping 574 matching lines @@
 
 void SyncBackendHostCore::ClearServerDataDone(
     const base::Closure& frontend_callback) {
   DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
   host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop,
              frontend_callback);
 }
 
 
 }  // namespace browser_sync