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

Unified Diff: chrome/browser/sync/engine/syncer.h

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/engine/syncapi_internal.cc ('k') | chrome/browser/sync/engine/syncer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer.h
diff --git a/chrome/browser/sync/engine/syncer.h b/chrome/browser/sync/engine/syncer.h
deleted file mode 100644
index aa2ec3e9d88bbb32cb06e08b72f234775b21abf0..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/engine/syncer.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
-#define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
-#pragma once
-
-#include <utility>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/gtest_prod_util.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
-#include "chrome/browser/sync/engine/conflict_resolver.h"
-#include "chrome/browser/sync/engine/syncer_types.h"
-#include "chrome/browser/sync/engine/syncproto.h"
-#include "chrome/browser/sync/sessions/sync_session.h"
-#include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/browser/sync/util/extensions_activity_monitor.h"
-
-namespace syncable {
-class Entry;
-class MutableEntry;
-} // namespace syncable
-
-namespace browser_sync {
-
-enum SyncerStep {
- SYNCER_BEGIN,
- CLEANUP_DISABLED_TYPES,
- DOWNLOAD_UPDATES,
- PROCESS_CLIENT_COMMAND,
- VERIFY_UPDATES,
- PROCESS_UPDATES,
- STORE_TIMESTAMPS,
- APPLY_UPDATES,
- BUILD_COMMIT_REQUEST,
- POST_COMMIT_MESSAGE,
- PROCESS_COMMIT_RESPONSE,
- RESOLVE_CONFLICTS,
- APPLY_UPDATES_TO_RESOLVE_CONFLICTS,
- CLEAR_PRIVATE_DATA, // TODO(tim): Rename 'private' to 'user'.
- SYNCER_END
-};
-
-// A Syncer provides a control interface for driving the individual steps
-// of the sync cycle. Each cycle (hopefully) moves the client into closer
-// synchronization with the server. The individual steps are modeled
-// as SyncerCommands, and the ordering of the steps is expressed using
-// the SyncerStep enum.
-//
-// A Syncer instance expects to run on a dedicated thread. Calls
-// to SyncShare() may take an unbounded amount of time, as SyncerCommands
-// may block on network i/o, on lock contention, or on tasks posted to
-// other threads.
-class Syncer {
- public:
- typedef std::vector<int64> UnsyncedMetaHandles;
-
- Syncer();
- virtual ~Syncer();
-
- // Called by other threads to tell the syncer to stop what it's doing
- // and return early from SyncShare, if possible.
- bool ExitRequested();
- void RequestEarlyExit();
-
- // Runs a sync cycle from |first_step| to |last_step|.
- virtual void SyncShare(sessions::SyncSession* session,
- SyncerStep first_step,
- SyncerStep last_step);
-
- private:
- // Implements the PROCESS_CLIENT_COMMAND syncer step.
- void ProcessClientCommand(sessions::SyncSession* session);
-
- bool early_exit_requested_;
- base::Lock early_exit_requested_lock_;
-
- ConflictResolver resolver_;
-
- friend class SyncerTest;
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, NameClashWithResolver);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, IllegalAndLegalUpdates);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingAndNewParent);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest,
- TestCommitListOrderingAndNewParentAndChild);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingCounterexample);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingWithNesting);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingWithNewItems);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestGetUnsyncedAndSimpleCommit);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestPurgeWhileUnsynced);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestPurgeWhileUnapplied);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, UnappliedUpdateDuringCommit);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryInFolder);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest,
- LongChangelistCreatesFakeOrphanedEntries);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, QuicklyMergeDualCreatedHierarchy);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, LongChangelistWithApplicationConflict);
- FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits);
- FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest,
- EntryCreatedInNewFolderMidSync);
-
- DISALLOW_COPY_AND_ASSIGN(Syncer);
-};
-
-// Utility function declarations.
-void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);
-void ClearServerData(syncable::MutableEntry* entry);
-const char* SyncerStepToString(const SyncerStep);
-
-} // namespace browser_sync
-
-#endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
« no previous file with comments | « chrome/browser/sync/engine/syncapi_internal.cc ('k') | chrome/browser/sync/engine/syncer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698