diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 21:10:21 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 21:10:21 +0000 |
| commit | 41ef4508ee9980a2945514ba2f913d1bf64ee326 (patch) | |
| tree | bc15a721ad72de224856f229a086abfa109a0384 /chrome/browser/sync/sync_setup_wizard_unittest.cc | |
| parent | 448644f367ad072a82d095615a98f2ab6bf2822b (diff) | |
| download | chromium_src-41ef4508ee9980a2945514ba2f913d1bf64ee326.zip chromium_src-41ef4508ee9980a2945514ba2f913d1bf64ee326.tar.gz chromium_src-41ef4508ee9980a2945514ba2f913d1bf64ee326.tar.bz2 | |
Added classes to enable session sync functionality.
TEST=ProfileSyncServiceSessionTest
BUG=30519
Original patch by jerrica@chromium.org
Original review: http://codereview.chromium.org/3168009
Review URL: http://codereview.chromium.org/3184004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_wizard_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/sync_setup_wizard_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc index cc6ffb0..cbced31 100644 --- a/chrome/browser/sync/sync_setup_wizard_unittest.cc +++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc @@ -164,8 +164,7 @@ class TestBrowserWindowForWizardTest : public TestBrowserWindow { class SyncSetupWizardTest : public BrowserWithTestWindowTest { public: SyncSetupWizardTest() - : ui_thread_(ChromeThread::UI, MessageLoop::current()), - file_thread_(ChromeThread::FILE, MessageLoop::current()), + : file_thread_(ChromeThread::FILE, MessageLoop::current()), test_window_(NULL), wizard_(NULL) { } virtual ~SyncSetupWizardTest() { } @@ -190,7 +189,6 @@ class SyncSetupWizardTest : public BrowserWithTestWindowTest { wizard_.reset(); } - ChromeThread ui_thread_; ChromeThread file_thread_; TestBrowserWindowForWizardTest* test_window_; scoped_ptr<SyncSetupWizard> wizard_; @@ -306,7 +304,8 @@ TEST_F(SyncSetupWizardTest, ChooseDataTypesSetsPrefs) { data_type_choices += "\"syncBookmarks\":true,\"syncPreferences\":true,"; data_type_choices += "\"syncThemes\":false,\"syncPasswords\":false,"; data_type_choices += "\"syncAutofill\":false,\"syncExtensions\":false,"; - data_type_choices += "\"syncTypedUrls\":true,\"syncApps\":true}"; + data_type_choices += "\"syncTypedUrls\":true,\"syncApps\":true,"; + data_type_choices += "\"syncSessions\":false}"; data_type_choices_value.Append(new StringValue(data_type_choices)); // Simulate the user choosing data types; bookmarks, prefs, typed |