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

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

Issue 9570055: [Sync] Add support for associating a new Synced Bookmarks node. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add python test Created 8 years, 9 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 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 } 745 }
746 746
747 void SyncTest::TriggerSetSyncTabs() { 747 void SyncTest::TriggerSetSyncTabs() {
748 ASSERT_TRUE(ServerSupportsErrorTriggering()); 748 ASSERT_TRUE(ServerSupportsErrorTriggering());
749 std::string path = "chromiumsync/synctabs"; 749 std::string path = "chromiumsync/synctabs";
750 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); 750 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
751 ASSERT_EQ("Sync Tabs", 751 ASSERT_EQ("Sync Tabs",
752 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle())); 752 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle()));
753 } 753 }
754 754
755 void SyncTest::TriggerCreateSyncedBookmarks() {
756 ASSERT_TRUE(ServerSupportsErrorTriggering());
757 std::string path = "chromiumsync/createsyncedbookmarks";
758 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
759 ASSERT_EQ("Synced Bookmarks",
760 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle()));
761 }
762
755 int SyncTest::NumberOfDefaultSyncItems() const { 763 int SyncTest::NumberOfDefaultSyncItems() const {
756 return number_of_default_sync_items_; 764 return number_of_default_sync_items_;
757 } 765 }
758 766
759 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 767 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
760 const net::ProxyConfig& proxy_config) { 768 const net::ProxyConfig& proxy_config) {
761 base::WaitableEvent done(false, false); 769 base::WaitableEvent done(false, false);
762 BrowserThread::PostTask( 770 BrowserThread::PostTask(
763 BrowserThread::IO, FROM_HERE, 771 BrowserThread::IO, FROM_HERE,
764 base::Bind(&SetProxyConfigCallback, &done, 772 base::Bind(&SetProxyConfigCallback, &done,
765 make_scoped_refptr(context_getter), proxy_config)); 773 make_scoped_refptr(context_getter), proxy_config));
766 done.Wait(); 774 done.Wait();
767 } 775 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698