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

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

Issue 8810001: Fixing a problem in ProfileManager when registering testing profiles and wanting them in the prof... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: =Increasing the value returned by SyncTest::NumberOfDefaultSyncItems() Created 9 years 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
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 ASSERT_EQ("Sync Tabs", 698 ASSERT_EQ("Sync Tabs",
699 UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle())); 699 UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
700 } 700 }
701 701
702 int SyncTest::NumberOfDefaultSyncItems() const { 702 int SyncTest::NumberOfDefaultSyncItems() const {
703 // Just return the current number of basic sync items that are synced, 703 // Just return the current number of basic sync items that are synced,
704 // including preferences, themes, and search engines. 704 // including preferences, themes, and search engines.
705 // TODO(stevet): It would be nice if there was some mechanism for retrieving 705 // TODO(stevet): It would be nice if there was some mechanism for retrieving
706 // this sum from each data type without having to manually count and update 706 // this sum from each data type without having to manually count and update
707 // this value. 707 // this value.
708 return 7; 708 return 9;
709 } 709 }
710 710
711 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 711 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
712 const net::ProxyConfig& proxy_config) { 712 const net::ProxyConfig& proxy_config) {
713 base::WaitableEvent done(false, false); 713 base::WaitableEvent done(false, false);
714 BrowserThread::PostTask( 714 BrowserThread::PostTask(
715 BrowserThread::IO, FROM_HERE, 715 BrowserThread::IO, FROM_HERE,
716 base::Bind(&SetProxyConfigCallback, &done, 716 base::Bind(&SetProxyConfigCallback, &done,
717 make_scoped_refptr(context_getter), proxy_config)); 717 make_scoped_refptr(context_getter), proxy_config));
718 done.Wait(); 718 done.Wait();
719 } 719 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698