Index: chrome/browser/sync/profile_sync_service.cc |
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc |
index bb6d595c4c432cd0fec2173f18654909c4d3ef95..54a6d2505e8190597cc429c11789f0f683ea00fb 100644 |
--- a/chrome/browser/sync/profile_sync_service.cc |
+++ b/chrome/browser/sync/profile_sync_service.cc |
@@ -102,13 +102,13 @@ |
#include "sync/internal_api/public/read_transaction.h" |
#endif |
-using browser_sync::ChangeProcessor; |
-using browser_sync::DataTypeController; |
-using browser_sync::DataTypeManager; |
-using browser_sync::FailedDataTypesHandler; |
using browser_sync::NotificationServiceSessionsRouter; |
using browser_sync::ProfileSyncServiceStartBehavior; |
using browser_sync::SyncBackendHost; |
+using sync_driver::ChangeProcessor; |
+using sync_driver::DataTypeController; |
+using sync_driver::DataTypeManager; |
+using sync_driver::FailedDataTypesHandler; |
using syncer::ModelType; |
using syncer::ModelTypeSet; |
using syncer::JsBackend; |
@@ -210,7 +210,7 @@ ProfileSyncService::ProfileSyncService( |
encrypted_types_(syncer::SyncEncryptionHandler::SensitiveTypes()), |
encrypt_everything_(false), |
encryption_pending_(false), |
- configure_status_(DataTypeManager::UNKNOWN), |
+ configure_status_(sync_driver::DataTypeManager::UNKNOWN), |
oauth2_token_service_(oauth2_token_service), |
request_access_token_backoff_(&kRequestAccessTokenBackoffPolicy), |
weak_factory_(this), |
@@ -496,8 +496,8 @@ void ProfileSyncService::RemoveObserverForDeviceInfoChange( |
} |
void ProfileSyncService::GetDataTypeControllerStates( |
- browser_sync::DataTypeController::StateMap* state_map) const { |
- for (browser_sync::DataTypeController::TypeMap::const_iterator iter = |
+ sync_driver::DataTypeController::StateMap* state_map) const { |
maxbogue
2014/07/21 22:14:21
Is the prefix necessary? There's a using line at t
Nicolas Zea
2014/07/21 22:23:31
Done, here and below.
|
+ for (sync_driver::DataTypeController::TypeMap::const_iterator iter = |
directory_data_type_controllers_.begin(); |
iter != directory_data_type_controllers_.end(); |
++iter) |
@@ -820,7 +820,8 @@ void ProfileSyncService::ShutdownImpl( |
// database (which doesn't get destroyed until we destroy the backend below) |
// as an unsynced change. That will be persisted, and committed on restart. |
if (directory_data_type_manager_) { |
- if (directory_data_type_manager_->state() != DataTypeManager::STOPPED) { |
+ if (directory_data_type_manager_->state() != |
+ sync_driver::DataTypeManager::STOPPED) { |
// When aborting as part of shutdown, we should expect an aborted sync |
// configure result, else we'll dcheck when we try to read the sync error. |
expect_sync_configuration_aborted_ = true; |
@@ -1457,7 +1458,7 @@ void ProfileSyncService::OnActionableError(const SyncProtocolError& error) { |
} |
void ProfileSyncService::OnConfigureDone( |
- const browser_sync::DataTypeManager::ConfigureResult& result) { |
+ const sync_driver::DataTypeManager::ConfigureResult& result) { |
// We should have cleared our cached passphrase before we get here (in |
// OnBackendInitialized()). |
DCHECK(cached_passphrase_.empty()); |
@@ -1716,17 +1717,17 @@ void ProfileSyncService::UpdateSelectedTypesHistogram( |
// Only log the data types that are shown in the sync settings ui. |
// Note: the order of these types must match the ordering of |
// the respective types in ModelType |
-const browser_sync::user_selectable_type::UserSelectableSyncType |
+const sync_driver::user_selectable_type::UserSelectableSyncType |
user_selectable_types[] = { |
- browser_sync::user_selectable_type::BOOKMARKS, |
- browser_sync::user_selectable_type::PREFERENCES, |
- browser_sync::user_selectable_type::PASSWORDS, |
- browser_sync::user_selectable_type::AUTOFILL, |
- browser_sync::user_selectable_type::THEMES, |
- browser_sync::user_selectable_type::TYPED_URLS, |
- browser_sync::user_selectable_type::EXTENSIONS, |
- browser_sync::user_selectable_type::APPS, |
- browser_sync::user_selectable_type::PROXY_TABS |
+ sync_driver::user_selectable_type::BOOKMARKS, |
+ sync_driver::user_selectable_type::PREFERENCES, |
+ sync_driver::user_selectable_type::PASSWORDS, |
+ sync_driver::user_selectable_type::AUTOFILL, |
+ sync_driver::user_selectable_type::THEMES, |
+ sync_driver::user_selectable_type::TYPED_URLS, |
+ sync_driver::user_selectable_type::EXTENSIONS, |
+ sync_driver::user_selectable_type::APPS, |
+ sync_driver::user_selectable_type::PROXY_TABS |
}; |
COMPILE_ASSERT(32 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); |
@@ -1748,7 +1749,7 @@ const browser_sync::user_selectable_type::UserSelectableSyncType |
UMA_HISTOGRAM_ENUMERATION( |
"Sync.CustomSync", |
user_selectable_types[i], |
- browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT + 1); |
+ sync_driver::user_selectable_type::SELECTABLE_DATATYPE_COUNT + 1); |
} |
} |
} |