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

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: Rebase, address comments 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 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 } 747 }
748 748
749 void SyncTest::TriggerSetSyncTabs() { 749 void SyncTest::TriggerSetSyncTabs() {
750 ASSERT_TRUE(ServerSupportsErrorTriggering()); 750 ASSERT_TRUE(ServerSupportsErrorTriggering());
751 std::string path = "chromiumsync/synctabs"; 751 std::string path = "chromiumsync/synctabs";
752 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); 752 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
753 ASSERT_EQ("Sync Tabs", 753 ASSERT_EQ("Sync Tabs",
754 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle())); 754 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle()));
755 } 755 }
756 756
757 void SyncTest::TriggerCreateSyncedBookmarks() {
758 ASSERT_TRUE(ServerSupportsErrorTriggering());
759 std::string path = "chromiumsync/createsyncedbookmarks";
760 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
761 ASSERT_EQ("Synced Bookmarks",
762 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle()));
763 }
764
757 int SyncTest::NumberOfDefaultSyncItems() const { 765 int SyncTest::NumberOfDefaultSyncItems() const {
758 return number_of_default_sync_items_; 766 return number_of_default_sync_items_;
759 } 767 }
760 768
761 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 769 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
762 const net::ProxyConfig& proxy_config) { 770 const net::ProxyConfig& proxy_config) {
763 base::WaitableEvent done(false, false); 771 base::WaitableEvent done(false, false);
764 BrowserThread::PostTask( 772 BrowserThread::PostTask(
765 BrowserThread::IO, FROM_HERE, 773 BrowserThread::IO, FROM_HERE,
766 base::Bind(&SetProxyConfigCallback, &done, 774 base::Bind(&SetProxyConfigCallback, &done,
767 make_scoped_refptr(context_getter), proxy_config)); 775 make_scoped_refptr(context_getter), proxy_config));
768 done.Wait(); 776 done.Wait();
769 } 777 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698