Index: chrome/browser/sync/test/integration/sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc |
index ce819524e36ad93557a8463eaf93d7cf0dc7961b..f3c5d9bc35bb2c3bbaa2f695df4e6cf173ef6ab5 100644 |
--- a/chrome/browser/sync/test/integration/sync_test.cc |
+++ b/chrome/browser/sync/test/integration/sync_test.cc |
@@ -909,91 +909,6 @@ void SyncTest::TriggerXmppAuthError() { |
ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); |
} |
-namespace { |
- |
-sync_pb::SyncEnums::ErrorType |
- GetClientToServerResponseErrorType( |
- syncer::SyncProtocolErrorType error) { |
- switch (error) { |
- case syncer::SYNC_SUCCESS: |
- return sync_pb::SyncEnums::SUCCESS; |
- case syncer::NOT_MY_BIRTHDAY: |
- return sync_pb::SyncEnums::NOT_MY_BIRTHDAY; |
- case syncer::THROTTLED: |
- return sync_pb::SyncEnums::THROTTLED; |
- case syncer::CLEAR_PENDING: |
- return sync_pb::SyncEnums::CLEAR_PENDING; |
- case syncer::TRANSIENT_ERROR: |
- return sync_pb::SyncEnums::TRANSIENT_ERROR; |
- case syncer::MIGRATION_DONE: |
- return sync_pb::SyncEnums::MIGRATION_DONE; |
- case syncer::UNKNOWN_ERROR: |
- return sync_pb::SyncEnums::UNKNOWN; |
- case syncer::INVALID_CREDENTIAL: |
- NOTREACHED(); // NOTREACHED() because auth error is not set through |
- // error code in sync response. |
- return sync_pb::SyncEnums::UNKNOWN; |
- case syncer::DISABLED_BY_ADMIN: |
- return sync_pb::SyncEnums::DISABLED_BY_ADMIN; |
- case syncer::USER_ROLLBACK: |
- return sync_pb::SyncEnums::USER_ROLLBACK; |
- case syncer::NON_RETRIABLE_ERROR: |
- return sync_pb::SyncEnums::UNKNOWN; |
- } |
- return sync_pb::SyncEnums::UNKNOWN; |
-} |
- |
-sync_pb::SyncEnums::Action GetClientToServerResponseAction( |
- const syncer::ClientAction& action) { |
- switch (action) { |
- case syncer::UPGRADE_CLIENT: |
- return sync_pb::SyncEnums::UPGRADE_CLIENT; |
- case syncer::CLEAR_USER_DATA_AND_RESYNC: |
- return sync_pb::SyncEnums::CLEAR_USER_DATA_AND_RESYNC; |
- case syncer::ENABLE_SYNC_ON_ACCOUNT: |
- return sync_pb::SyncEnums::ENABLE_SYNC_ON_ACCOUNT; |
- case syncer::STOP_AND_RESTART_SYNC: |
- return sync_pb::SyncEnums::STOP_AND_RESTART_SYNC; |
- case syncer::DISABLE_SYNC_ON_CLIENT: |
- return sync_pb::SyncEnums::DISABLE_SYNC_ON_CLIENT; |
- case syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT: |
- case syncer::DISABLE_SYNC_AND_ROLLBACK: |
- case syncer::ROLLBACK_DONE: |
- NOTREACHED(); // No corresponding proto action for these. Shouldn't |
- // test. |
- return sync_pb::SyncEnums::UNKNOWN_ACTION; |
- case syncer::UNKNOWN_ACTION: |
- return sync_pb::SyncEnums::UNKNOWN_ACTION; |
- } |
- return sync_pb::SyncEnums::UNKNOWN_ACTION; |
-} |
- |
-} // namespace |
- |
-void SyncTest::TriggerSyncError(const syncer::SyncProtocolError& error, |
- SyncErrorFrequency frequency) { |
- ASSERT_TRUE(ServerSupportsErrorTriggering()); |
- std::string path = "chromiumsync/error"; |
- int error_type = |
- static_cast<int>(GetClientToServerResponseErrorType( |
- error.error_type)); |
- int action = static_cast<int>(GetClientToServerResponseAction( |
- error.action)); |
- |
- path.append(base::StringPrintf("?error=%d", error_type)); |
- path.append(base::StringPrintf("&action=%d", action)); |
- |
- path.append(base::StringPrintf("&error_description=%s", |
- error.error_description.c_str())); |
- path.append(base::StringPrintf("&url=%s", error.url.c_str())); |
- path.append(base::StringPrintf("&frequency=%d", frequency)); |
- |
- ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); |
- std::string output = base::UTF16ToASCII( |
- browser()->tab_strip_model()->GetActiveWebContents()->GetTitle()); |
- ASSERT_TRUE(output.find("SetError: 200") != base::string16::npos); |
-} |
- |
void SyncTest::TriggerCreateSyncedBookmarks() { |
ASSERT_TRUE(ServerSupportsErrorTriggering()); |
std::string path = "chromiumsync/createsyncedbookmarks"; |