[Sync] Move //components/sync_driver to //components/sync/driver.

components/sync/driver/startup_controller.cc

 // Copyright 2014 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 "components/sync_driver/startup_controller.h"
+#include "components/sync/driver/startup_controller.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/sync_driver/sync_driver_switches.h"
-#include "components/sync_driver/sync_prefs.h"
+#include "components/sync/driver/sync_driver_switches.h"
+#include "components/sync/driver/sync_prefs.h"
 
 namespace browser_sync {
 
 namespace {
 
 // The amount of time we'll wait to initialize sync if no data type triggers
 // initialization via a StartSyncFlare.
 const int kDeferredInitFallbackSeconds = 10;
 
 // Enum (for UMA, primarily) defining different events that cause us to
@@ skipping 111 matching lines @@
 
 bool StartupController::TryStartImmediately() {
   received_start_request_ = true;
   bypass_setup_complete_ = true;
   return TryStart();
 }
 
 void StartupController::RecordTimeDeferred() {
   DCHECK(!start_up_time_.is_null());
   base::TimeDelta time_deferred = base::Time::Now() - start_up_time_;
-  UMA_HISTOGRAM_CUSTOM_TIMES("Sync.Startup.TimeDeferred2",
-      time_deferred,
-      base::TimeDelta::FromSeconds(0),
-      base::TimeDelta::FromMinutes(2),
-      60);
+  UMA_HISTOGRAM_CUSTOM_TIMES("Sync.Startup.TimeDeferred2", time_deferred,
+                             base::TimeDelta::FromSeconds(0),
+                             base::TimeDelta::FromMinutes(2), 60);
 }
 
 void StartupController::OnFallbackStartupTimerExpired() {
   DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSyncDisableDeferredStartup));
 
   if (!start_backend_time_.is_null())
     return;
 
   DVLOG(2) << "Sync deferred init fallback timer expired, starting backend.";
   RecordTimeDeferred();
   UMA_HISTOGRAM_ENUMERATION("Sync.Startup.DeferredInitTrigger",
-                            TRIGGER_FALLBACK_TIMER,
-                            MAX_TRIGGER_VALUE);
+                            TRIGGER_FALLBACK_TIMER, MAX_TRIGGER_VALUE);
   received_start_request_ = true;
   TryStart();
 }
 
 std::string StartupController::GetBackendInitializationStateString() const {
   if (!start_backend_time_.is_null())
     return "Started";
   else if (!start_up_time_.is_null())
     return "Deferred";
   else
@@ skipping 15 matching lines @@
            << syncer::ModelTypeToString(type);
   // Measure the time spent waiting for init and the type that triggered it.
   // We could measure the time spent deferred on a per-datatype basis, but
   // for now this is probably sufficient.
   if (!start_up_time_.is_null()) {
     RecordTimeDeferred();
     UMA_HISTOGRAM_ENUMERATION("Sync.Startup.TypeTriggeringInit",
                               ModelTypeToHistogramInt(type),
                               syncer::MODEL_TYPE_COUNT);
     UMA_HISTOGRAM_ENUMERATION("Sync.Startup.DeferredInitTrigger",
-                              TRIGGER_DATA_TYPE_REQUEST,
-                              MAX_TRIGGER_VALUE);
+                              TRIGGER_DATA_TYPE_REQUEST, MAX_TRIGGER_VALUE);
   }
   received_start_request_ = true;
   TryStart();
 }
 
 }  // namespace browser_sync