Index: components/sync/driver/non_blocking_data_type_controller.cc |
diff --git a/components/sync_driver/non_blocking_data_type_controller.cc b/components/sync/driver/non_blocking_data_type_controller.cc |
similarity index 96% |
rename from components/sync_driver/non_blocking_data_type_controller.cc |
rename to components/sync/driver/non_blocking_data_type_controller.cc |
index d669d08de9535278b42c99734dc1a9c9e5b8922a..6f4a6c118e8dfc3286b5ffed6993320fb40ced95 100644 |
--- a/components/sync_driver/non_blocking_data_type_controller.cc |
+++ b/components/sync/driver/non_blocking_data_type_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/non_blocking_data_type_controller.h" |
+#include "components/sync/driver/non_blocking_data_type_controller.h" |
#include <utility> |
@@ -16,8 +16,8 @@ |
#include "components/sync/api/sync_merge_result.h" |
#include "components/sync/base/data_type_histogram.h" |
#include "components/sync/core/activation_context.h" |
-#include "components/sync_driver/backend_data_type_configurer.h" |
-#include "components/sync_driver/sync_client.h" |
+#include "components/sync/driver/backend_data_type_configurer.h" |
+#include "components/sync/driver/sync_client.h" |
namespace sync_driver_v2 { |
@@ -185,8 +185,10 @@ void NonBlockingDataTypeController::Stop() { |
sync_prefs_.GetPreferredDataTypes(syncer::ModelTypeSet(type())); |
if ((state() == MODEL_LOADED || state() == RUNNING) && |
(!sync_prefs_.IsFirstSetupComplete() || !preferred_types.Has(type()))) { |
- RunOnModelThread(FROM_HERE, base::Bind( |
- &NonBlockingDataTypeController::DisableSyncOnModelThread, this)); |
+ RunOnModelThread( |
+ FROM_HERE, |
+ base::Bind(&NonBlockingDataTypeController::DisableSyncOnModelThread, |
+ this)); |
} |
state_ = NOT_RUNNING; |