Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(934)

Unified Diff: chrome/browser/sync/test/integration/enable_disable_test.cc

Issue 513543004: [Sync] Rename FailedDataTypesHandler -> DataTypeStatusTable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | components/sync_driver.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1039f11622e3cd113252483b6fe25facbfaa1dbe..fdb7f57ad6b3ed6f231e7da4bcd5c4a4bb117da5 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -32,9 +32,9 @@ bool DoesTopLevelNodeExist(syncer::UserShare* user_share,
return node.InitTypeRoot(type) == syncer::BaseNode::INIT_OK;
}
-bool IsUnready(const sync_driver::FailedDataTypesHandler& failed_handler,
+bool IsUnready(const sync_driver::DataTypeStatusTable& data_type_status_table,
syncer::ModelType type) {
- return failed_handler.GetUnreadyErrorTypes().Has(type);
+ return data_type_status_table.GetUnreadyErrorTypes().Has(type);
}
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
@@ -46,8 +46,8 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
const syncer::ModelTypeSet registered_types =
GetSyncService(0)->GetRegisteredDataTypes();
syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
- const sync_driver::FailedDataTypesHandler& failed_handler =
- GetSyncService(0)->failed_data_types_handler();
+ const sync_driver::DataTypeStatusTable& data_type_status_table =
+ GetSyncService(0)->data_type_status_table();
for (syncer::ModelTypeSet::Iterator it = registered_types.First();
it.Good(); it.Inc()) {
ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
@@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
if (!syncer::ProxyTypes().Has(it.Get())) {
ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()) ||
- IsUnready(failed_handler, it.Get()))
+ IsUnready(data_type_status_table, it.Get()))
<< syncer::ModelTypeToString(it.Get());
}
@@ -90,15 +90,15 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
- const sync_driver::FailedDataTypesHandler& failed_handler =
- GetSyncService(0)->failed_data_types_handler();
+ const sync_driver::DataTypeStatusTable& data_type_status_table =
+ GetSyncService(0)->data_type_status_table();
// Make sure all top-level nodes exist first.
for (syncer::ModelTypeSet::Iterator it = registered_types.First();
it.Good(); it.Inc()) {
if (!syncer::ProxyTypes().Has(it.Get())) {
ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()) ||
- IsUnready(failed_handler, it.Get()));
+ IsUnready(data_type_status_table, it.Get()));
}
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | components/sync_driver.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698