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

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/test/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 635
636 void SyncTest::EnableNotifications() { 636 void SyncTest::EnableNotifications() {
637 EnableNotificationsImpl(); 637 EnableNotificationsImpl();
638 notifications_enabled_ = true; 638 notifications_enabled_ = true;
639 } 639 }
640 640
641 void SyncTest::TriggerNotification( 641 void SyncTest::TriggerNotification(
642 syncable::ModelTypeSet changed_types) { 642 syncable::ModelTypeSet changed_types) {
643 ASSERT_TRUE(ServerSupportsNotificationControl()); 643 ASSERT_TRUE(ServerSupportsNotificationControl());
644 const std::string& data = 644 const std::string& data =
645 csync::P2PNotificationData("from_server", 645 syncer::P2PNotificationData("from_server",
646 csync::NOTIFY_ALL, 646 syncer::NOTIFY_ALL,
647 changed_types).ToString(); 647 changed_types).ToString();
648 const std::string& path = 648 const std::string& path =
649 std::string("chromiumsync/sendnotification?channel=") + 649 std::string("chromiumsync/sendnotification?channel=") +
650 csync::kSyncP2PNotificationChannel + "&data=" + data; 650 syncer::kSyncP2PNotificationChannel + "&data=" + data;
651 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); 651 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
652 ASSERT_EQ("Notification sent", 652 ASSERT_EQ("Notification sent",
653 UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); 653 UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
654 } 654 }
655 655
656 bool SyncTest::ServerSupportsErrorTriggering() const { 656 bool SyncTest::ServerSupportsErrorTriggering() const {
657 EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_); 657 EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
658 658
659 // Supported only if we're using the python testserver. 659 // Supported only if we're using the python testserver.
660 return server_type_ == LOCAL_PYTHON_SERVER; 660 return server_type_ == LOCAL_PYTHON_SERVER;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 void SyncTest::TriggerAuthError() { 697 void SyncTest::TriggerAuthError() {
698 ASSERT_TRUE(ServerSupportsErrorTriggering()); 698 ASSERT_TRUE(ServerSupportsErrorTriggering());
699 std::string path = "chromiumsync/cred"; 699 std::string path = "chromiumsync/cred";
700 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); 700 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
701 } 701 }
702 702
703 namespace { 703 namespace {
704 704
705 sync_pb::SyncEnums::ErrorType 705 sync_pb::SyncEnums::ErrorType
706 GetClientToServerResponseErrorType( 706 GetClientToServerResponseErrorType(
707 csync::SyncProtocolErrorType error) { 707 syncer::SyncProtocolErrorType error) {
708 switch (error) { 708 switch (error) {
709 case csync::SYNC_SUCCESS: 709 case syncer::SYNC_SUCCESS:
710 return sync_pb::SyncEnums::SUCCESS; 710 return sync_pb::SyncEnums::SUCCESS;
711 case csync::NOT_MY_BIRTHDAY: 711 case syncer::NOT_MY_BIRTHDAY:
712 return sync_pb::SyncEnums::NOT_MY_BIRTHDAY; 712 return sync_pb::SyncEnums::NOT_MY_BIRTHDAY;
713 case csync::THROTTLED: 713 case syncer::THROTTLED:
714 return sync_pb::SyncEnums::THROTTLED; 714 return sync_pb::SyncEnums::THROTTLED;
715 case csync::CLEAR_PENDING: 715 case syncer::CLEAR_PENDING:
716 return sync_pb::SyncEnums::CLEAR_PENDING; 716 return sync_pb::SyncEnums::CLEAR_PENDING;
717 case csync::TRANSIENT_ERROR: 717 case syncer::TRANSIENT_ERROR:
718 return sync_pb::SyncEnums::TRANSIENT_ERROR; 718 return sync_pb::SyncEnums::TRANSIENT_ERROR;
719 case csync::MIGRATION_DONE: 719 case syncer::MIGRATION_DONE:
720 return sync_pb::SyncEnums::MIGRATION_DONE; 720 return sync_pb::SyncEnums::MIGRATION_DONE;
721 case csync::UNKNOWN_ERROR: 721 case syncer::UNKNOWN_ERROR:
722 return sync_pb::SyncEnums::UNKNOWN; 722 return sync_pb::SyncEnums::UNKNOWN;
723 default: 723 default:
724 NOTREACHED(); 724 NOTREACHED();
725 return sync_pb::SyncEnums::UNKNOWN; 725 return sync_pb::SyncEnums::UNKNOWN;
726 } 726 }
727 } 727 }
728 728
729 sync_pb::SyncEnums::Action GetClientToServerResponseAction( 729 sync_pb::SyncEnums::Action GetClientToServerResponseAction(
730 const csync::ClientAction& action) { 730 const syncer::ClientAction& action) {
731 switch (action) { 731 switch (action) {
732 case csync::UPGRADE_CLIENT: 732 case syncer::UPGRADE_CLIENT:
733 return sync_pb::SyncEnums::UPGRADE_CLIENT; 733 return sync_pb::SyncEnums::UPGRADE_CLIENT;
734 case csync::CLEAR_USER_DATA_AND_RESYNC: 734 case syncer::CLEAR_USER_DATA_AND_RESYNC:
735 return sync_pb::SyncEnums::CLEAR_USER_DATA_AND_RESYNC; 735 return sync_pb::SyncEnums::CLEAR_USER_DATA_AND_RESYNC;
736 case csync::ENABLE_SYNC_ON_ACCOUNT: 736 case syncer::ENABLE_SYNC_ON_ACCOUNT:
737 return sync_pb::SyncEnums::ENABLE_SYNC_ON_ACCOUNT; 737 return sync_pb::SyncEnums::ENABLE_SYNC_ON_ACCOUNT;
738 case csync::STOP_AND_RESTART_SYNC: 738 case syncer::STOP_AND_RESTART_SYNC:
739 return sync_pb::SyncEnums::STOP_AND_RESTART_SYNC; 739 return sync_pb::SyncEnums::STOP_AND_RESTART_SYNC;
740 case csync::DISABLE_SYNC_ON_CLIENT: 740 case syncer::DISABLE_SYNC_ON_CLIENT:
741 return sync_pb::SyncEnums::DISABLE_SYNC_ON_CLIENT; 741 return sync_pb::SyncEnums::DISABLE_SYNC_ON_CLIENT;
742 case csync::UNKNOWN_ACTION: 742 case syncer::UNKNOWN_ACTION:
743 return sync_pb::SyncEnums::UNKNOWN_ACTION; 743 return sync_pb::SyncEnums::UNKNOWN_ACTION;
744 default: 744 default:
745 NOTREACHED(); 745 NOTREACHED();
746 return sync_pb::SyncEnums::UNKNOWN_ACTION; 746 return sync_pb::SyncEnums::UNKNOWN_ACTION;
747 } 747 }
748 } 748 }
749 749
750 } // namespace 750 } // namespace
751 751
752 void SyncTest::TriggerSyncError(const csync::SyncProtocolError& error, 752 void SyncTest::TriggerSyncError(const syncer::SyncProtocolError& error,
753 SyncErrorFrequency frequency) { 753 SyncErrorFrequency frequency) {
754 ASSERT_TRUE(ServerSupportsErrorTriggering()); 754 ASSERT_TRUE(ServerSupportsErrorTriggering());
755 std::string path = "chromiumsync/error"; 755 std::string path = "chromiumsync/error";
756 int error_type = 756 int error_type =
757 static_cast<int>(GetClientToServerResponseErrorType( 757 static_cast<int>(GetClientToServerResponseErrorType(
758 error.error_type)); 758 error.error_type));
759 int action = static_cast<int>(GetClientToServerResponseAction( 759 int action = static_cast<int>(GetClientToServerResponseAction(
760 error.action)); 760 error.action));
761 761
762 path.append(base::StringPrintf("?error=%d", error_type)); 762 path.append(base::StringPrintf("?error=%d", error_type));
(...skipping 24 matching lines...) Expand all
787 787
788 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 788 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
789 const net::ProxyConfig& proxy_config) { 789 const net::ProxyConfig& proxy_config) {
790 base::WaitableEvent done(false, false); 790 base::WaitableEvent done(false, false);
791 BrowserThread::PostTask( 791 BrowserThread::PostTask(
792 BrowserThread::IO, FROM_HERE, 792 BrowserThread::IO, FROM_HERE,
793 base::Bind(&SetProxyConfigCallback, &done, 793 base::Bind(&SetProxyConfigCallback, &done,
794 make_scoped_refptr(context_getter), proxy_config)); 794 make_scoped_refptr(context_getter), proxy_config));
795 done.Wait(); 795 done.Wait();
796 } 796 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698