| 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 dfd4c3f28be5d1dbfef050192cd4eb87e33653b3..c9bf7ca95f499a81a989674642d377f484626c0a 100644
|
| --- a/chrome/browser/sync/test/integration/enable_disable_test.cc
|
| +++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
|
| @@ -34,7 +34,7 @@ bool DoesTopLevelNodeExist(syncer::UserShare* user_share,
|
| return node.InitTypeRoot(type) == syncer::BaseNode::INIT_OK;
|
| }
|
|
|
| -bool IsUnready(const sync_driver::DataTypeStatusTable& data_type_status_table,
|
| +bool IsUnready(const syncer::DataTypeStatusTable& data_type_status_table,
|
| syncer::ModelType type) {
|
| return data_type_status_table.GetUnreadyErrorTypes().Has(type);
|
| }
|
| @@ -46,7 +46,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
|
| ASSERT_TRUE(GetClient(0)->SetupSync(syncer::ModelTypeSet()));
|
|
|
| syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
|
| - const sync_driver::DataTypeStatusTable& data_type_status_table =
|
| + const syncer::DataTypeStatusTable& data_type_status_table =
|
| GetSyncService(0)->data_type_status_table();
|
|
|
| const syncer::ModelTypeSet registered_types =
|
| @@ -95,7 +95,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
|
|
|
| syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
|
|
|
| - const sync_driver::DataTypeStatusTable& data_type_status_table =
|
| + const syncer::DataTypeStatusTable& data_type_status_table =
|
| GetSyncService(0)->data_type_status_table();
|
|
|
| // Make sure all top-level nodes exist first.
|
|
|