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

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

Issue 12114012: Remove syncer::IncomingInvalidationSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove comment Created 7 years, 10 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 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 notifications_enabled_ = true; 673 notifications_enabled_ = true;
674 } 674 }
675 675
676 void SyncTest::TriggerNotification(syncer::ModelTypeSet changed_types) { 676 void SyncTest::TriggerNotification(syncer::ModelTypeSet changed_types) {
677 ASSERT_TRUE(ServerSupportsNotificationControl()); 677 ASSERT_TRUE(ServerSupportsNotificationControl());
678 const std::string& data = 678 const std::string& data =
679 syncer::P2PNotificationData( 679 syncer::P2PNotificationData(
680 "from_server", 680 "from_server",
681 syncer::NOTIFY_ALL, 681 syncer::NOTIFY_ALL,
682 syncer::ObjectIdSetToInvalidationMap( 682 syncer::ObjectIdSetToInvalidationMap(
683 syncer::ModelTypeSetToObjectIdSet(changed_types), std::string()), 683 syncer::ModelTypeSetToObjectIdSet(changed_types), std::string())
684 syncer::REMOTE_INVALIDATION).ToString(); 684 ).ToString();
685 const std::string& path = 685 const std::string& path =
686 std::string("chromiumsync/sendnotification?channel=") + 686 std::string("chromiumsync/sendnotification?channel=") +
687 syncer::kSyncP2PNotificationChannel + "&data=" + data; 687 syncer::kSyncP2PNotificationChannel + "&data=" + data;
688 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); 688 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
689 ASSERT_EQ("Notification sent", 689 ASSERT_EQ("Notification sent",
690 UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()-> 690 UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
691 GetTitle())); 691 GetTitle()));
692 } 692 }
693 693
694 bool SyncTest::ServerSupportsErrorTriggering() const { 694 bool SyncTest::ServerSupportsErrorTriggering() const {
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 834
835 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 835 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
836 const net::ProxyConfig& proxy_config) { 836 const net::ProxyConfig& proxy_config) {
837 base::WaitableEvent done(false, false); 837 base::WaitableEvent done(false, false);
838 BrowserThread::PostTask( 838 BrowserThread::PostTask(
839 BrowserThread::IO, FROM_HERE, 839 BrowserThread::IO, FROM_HERE,
840 base::Bind(&SetProxyConfigCallback, &done, 840 base::Bind(&SetProxyConfigCallback, &done,
841 make_scoped_refptr(context_getter), proxy_config)); 841 make_scoped_refptr(context_getter), proxy_config));
842 done.Wait(); 842 done.Wait();
843 } 843 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698