[Sync] Move //components/sync to the syncer namespace, take 2.

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 <string>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/metrics/histogram_macros.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"
 
-namespace browser_sync {
+namespace syncer {
 
 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
 // exit the "deferred" state of initialization and invoke start_backend.
 enum DeferredInitTrigger {
   // We have received a signal from a SyncableService requesting that sync
   // starts as soon as possible.
   TRIGGER_DATA_TYPE_REQUEST,
   // No data type requested sync to start and our fallback timer expired.
   TRIGGER_FALLBACK_TIMER,
   MAX_TRIGGER_VALUE
 };
 
 }  // namespace
 
-StartupController::StartupController(const sync_driver::SyncPrefs* sync_prefs,
+StartupController::StartupController(const SyncPrefs* sync_prefs,
                                      base::Callback<bool()> can_start,
                                      base::Closure start_backend)
     : bypass_setup_complete_(false),
       received_start_request_(false),
       setup_in_progress_(false),
       sync_prefs_(sync_prefs),
       can_start_(can_start),
       start_backend_(start_backend),
       fallback_timeout_(
           base::TimeDelta::FromSeconds(kDeferredInitFallbackSeconds)),
       weak_factory_(this) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSyncDeferredStartupTimeoutSeconds)) {
     int timeout = kDeferredInitFallbackSeconds;
     if (base::StringToInt(
             base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                 switches::kSyncDeferredStartupTimeoutSeconds),
             &timeout)) {
       DCHECK_GE(timeout, 0);
       DVLOG(2) << "Sync StartupController overriding startup timeout to "
                << timeout << " seconds.";
       fallback_timeout_ = base::TimeDelta::FromSeconds(timeout);
     }
   }
 }
 
 StartupController::~StartupController() {}
 
-void StartupController::Reset(const syncer::ModelTypeSet registered_types) {
+void StartupController::Reset(const ModelTypeSet registered_types) {
   received_start_request_ = false;
   bypass_setup_complete_ = false;
   start_up_time_ = base::Time();
   start_backend_time_ = base::Time();
   // Don't let previous timers affect us post-reset.
   weak_factory_.InvalidateWeakPtrs();
   registered_types_ = registered_types;
 }
 
 void StartupController::SetSetupInProgress(bool setup_in_progress) {
   setup_in_progress_ = setup_in_progress;
   if (setup_in_progress_) {
     TryStart();
   }
 }
 
 bool StartupController::StartUp(StartUpDeferredOption deferred_option) {
   const bool first_start = start_up_time_.is_null();
   if (first_start)
     start_up_time_ = base::Time::Now();
 
   if (deferred_option == STARTUP_BACKEND_DEFERRED &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSyncDisableDeferredStartup) &&
-      sync_prefs_->GetPreferredDataTypes(registered_types_)
-          .Has(syncer::SESSIONS)) {
+      sync_prefs_->GetPreferredDataTypes(registered_types_).Has(SESSIONS)) {
     if (first_start) {
       base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE,
           base::Bind(&StartupController::OnFallbackStartupTimerExpired,
                      weak_factory_.GetWeakPtr()),
           fallback_timeout_);
     }
     return false;
   }
 
@@ skipping 62 matching lines @@
 
 std::string StartupController::GetBackendInitializationStateString() const {
   if (!start_backend_time_.is_null())
     return "Started";
   else if (!start_up_time_.is_null())
     return "Deferred";
   else
     return "Not started";
 }
 
-void StartupController::OnDataTypeRequestsSyncStartup(syncer::ModelType type) {
+void StartupController::OnDataTypeRequestsSyncStartup(ModelType type) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSyncDisableDeferredStartup)) {
     DVLOG(2) << "Ignoring data type request for sync startup: "
-             << syncer::ModelTypeToString(type);
+             << ModelTypeToString(type);
     return;
   }
 
   if (!start_backend_time_.is_null())
     return;
 
-  DVLOG(2) << "Data type requesting sync startup: "
-           << syncer::ModelTypeToString(type);
+  DVLOG(2) << "Data type requesting sync startup: " << 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.
   UMA_HISTOGRAM_ENUMERATION("Sync.Startup.TypeTriggeringInit",
-                            ModelTypeToHistogramInt(type),
-                            syncer::MODEL_TYPE_COUNT);
+                            ModelTypeToHistogramInt(type), MODEL_TYPE_COUNT);
   if (!start_up_time_.is_null()) {
     RecordTimeDeferred();
     UMA_HISTOGRAM_ENUMERATION("Sync.Startup.DeferredInitTrigger",
                               TRIGGER_DATA_TYPE_REQUEST, MAX_TRIGGER_VALUE);
   }
   received_start_request_ = true;
   TryStart();
 }
 
-}  // namespace browser_sync
+}  // namespace syncer