diff options
author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 20:51:16 +0000 |
---|---|---|
committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 20:51:16 +0000 |
commit | 322acd5d974ed2955ae38d1722eabf851132061d (patch) | |
tree | cc949219fdcce77dbeb88496d5220f1a7b7871d8 /chrome/browser/sync/sessions | |
parent | d88d7d5d460cf83e402ebbc55f06e036bcb7e459 (diff) | |
download | chromium_src-322acd5d974ed2955ae38d1722eabf851132061d.zip chromium_src-322acd5d974ed2955ae38d1722eabf851132061d.tar.gz chromium_src-322acd5d974ed2955ae38d1722eabf851132061d.tar.bz2 |
make new syncer thread the default. Fixed all the test cases that failed.
BUG=26339
TEST=unit_tests.exe, sync_integration_tests.exe, sync_unit_tests.exe. manual testcases:
1. Set up a brand new profile to sync and make sure it syncs.
2. enable/disable a datatype and make sure it syncs.
3. Make change to a datatype locally and make sure it gets propagated.
4. make change to a datatype remotely and make sure it syncs down.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82026
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82067
Review URL: http://codereview.chromium.org/6874018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sessions')
-rw-r--r-- | chrome/browser/sync/sessions/sync_session_context.cc | 7 | ||||
-rw-r--r-- | chrome/browser/sync/sessions/sync_session_context.h | 7 |
2 files changed, 1 insertions, 13 deletions
diff --git a/chrome/browser/sync/sessions/sync_session_context.cc b/chrome/browser/sync/sessions/sync_session_context.cc index b5f072b..f0cbce4 100644 --- a/chrome/browser/sync/sessions/sync_session_context.cc +++ b/chrome/browser/sync/sessions/sync_session_context.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -36,10 +36,5 @@ SyncSessionContext::~SyncSessionContext() { } } -void SyncSessionContext::set_last_snapshot( - const SyncSessionSnapshot& snapshot) { - previous_session_snapshot_.reset(new SyncSessionSnapshot(snapshot)); -} - } // namespace sessions } // namespace browser_sync diff --git a/chrome/browser/sync/sessions/sync_session_context.h b/chrome/browser/sync/sessions/sync_session_context.h index 4ec8612..a3a69ec 100644 --- a/chrome/browser/sync/sessions/sync_session_context.h +++ b/chrome/browser/sync/sessions/sync_session_context.h @@ -92,13 +92,6 @@ class SyncSessionContext { previous_session_routing_info_ = info; } - // TODO(tim): Deprecated. Bug 26339. - sessions::SyncSessionSnapshot* previous_session_snapshot() { - return previous_session_snapshot_.get(); - } - - void set_last_snapshot(const SyncSessionSnapshot& snapshot); - void NotifyListeners(const SyncEngineEvent& event) { FOR_EACH_OBSERVER(SyncEngineEventListener, listeners_, OnSyncEngineEvent(event)); |