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

components/sync/driver/startup_controller.cc

Index: components/sync/driver/startup_controller.cc
diff --git a/components/sync_driver/startup_controller.cc b/components/sync/driver/startup_controller.cc
similarity index 92%
rename from components/sync_driver/startup_controller.cc
rename to components/sync/driver/startup_controller.cc
index 26b4ef7e55ea657a6638c07065ab8966023f510c..9a5b33b4815bfd334e2cb52ca2de7b2ade210230 100644
--- a/components/sync_driver/startup_controller.cc
+++ b/components/sync/driver/startup_controller.cc
@@ -2,7 +2,7 @@
 // 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>
 
@@ -12,8 +12,8 @@
 #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 {
 
@@ -145,11 +145,9 @@ bool StartupController::TryStartImmediately() {
 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() {
@@ -162,8 +160,7 @@ void StartupController::OnFallbackStartupTimerExpired() {
   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();
 }
@@ -199,8 +196,7 @@ void StartupController::OnDataTypeRequestsSyncStartup(syncer::ModelType type) {
                               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();