| Index: chrome/browser/sync/test/integration/enable_disable_test.cc | 
| diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc | 
| index ac021e874b107230f81cc4e68c9770385111dfb2..1039f11622e3cd113252483b6fe25facbfaa1dbe 100644 | 
| --- a/chrome/browser/sync/test/integration/enable_disable_test.cc | 
| +++ b/chrome/browser/sync/test/integration/enable_disable_test.cc | 
| @@ -32,7 +32,7 @@ bool DoesTopLevelNodeExist(syncer::UserShare* user_share, | 
| return node.InitTypeRoot(type) == syncer::BaseNode::INIT_OK; | 
| } | 
|  | 
| -bool IsUnready(const browser_sync::FailedDataTypesHandler& failed_handler, | 
| +bool IsUnready(const sync_driver::FailedDataTypesHandler& failed_handler, | 
| syncer::ModelType type) { | 
| return failed_handler.GetUnreadyErrorTypes().Has(type); | 
| } | 
| @@ -46,7 +46,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) { | 
| const syncer::ModelTypeSet registered_types = | 
| GetSyncService(0)->GetRegisteredDataTypes(); | 
| syncer::UserShare* user_share = GetSyncService(0)->GetUserShare(); | 
| -  const browser_sync::FailedDataTypesHandler& failed_handler = | 
| +  const sync_driver::FailedDataTypesHandler& failed_handler = | 
| GetSyncService(0)->failed_data_types_handler(); | 
| for (syncer::ModelTypeSet::Iterator it = registered_types.First(); | 
| it.Good(); it.Inc()) { | 
| @@ -90,7 +90,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) { | 
|  | 
| syncer::UserShare* user_share = GetSyncService(0)->GetUserShare(); | 
|  | 
| -  const browser_sync::FailedDataTypesHandler& failed_handler = | 
| +  const sync_driver::FailedDataTypesHandler& failed_handler = | 
| GetSyncService(0)->failed_data_types_handler(); | 
|  | 
| // Make sure all top-level nodes exist first. | 
|  |