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

Unified Diff: chrome/browser/extensions/test_extension_service.h

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 8 years, 6 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
Index: chrome/browser/extensions/test_extension_service.h
diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h
index e445f2002144b0d357a9535b3ac274f0d30755c1..4785b6ce6fc470bd354679dd593faedf61b941ba 100644
--- a/chrome/browser/extensions/test_extension_service.h
+++ b/chrome/browser/extensions/test_extension_service.h
@@ -12,7 +12,10 @@
#include "chrome/browser/extensions/extension_service.h"
class CrxInstaller;
+
+namespace csync {
class SyncErrorFactory;
+}
namespace extensions {
class Extension;
@@ -49,16 +52,17 @@ class TestExtensionService : public ExtensionServiceInterface {
virtual void CheckAdminBlacklist() OVERRIDE;
virtual void CheckForUpdatesSoon() OVERRIDE;
- virtual SyncError MergeDataAndStartSyncing(
+ virtual csync::SyncError MergeDataAndStartSyncing(
syncable::ModelType type,
- const SyncDataList& initial_sync_data,
- scoped_ptr<SyncChangeProcessor> sync_processor,
- scoped_ptr<SyncErrorFactory> sync_error_factory) OVERRIDE;
+ const csync::SyncDataList& initial_sync_data,
+ scoped_ptr<csync::SyncChangeProcessor> sync_processor,
+ scoped_ptr<csync::SyncErrorFactory> sync_error_factory) OVERRIDE;
virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
- virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;
- virtual SyncError ProcessSyncChanges(
+ virtual csync::SyncDataList GetAllSyncData(
+ syncable::ModelType type) const OVERRIDE;
+ virtual csync::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
- const SyncChangeList& change_list) OVERRIDE;
+ const csync::SyncChangeList& change_list) OVERRIDE;
virtual bool is_ready() OVERRIDE;
« no previous file with comments | « chrome/browser/extensions/settings/syncable_settings_storage.cc ('k') | chrome/browser/extensions/test_extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698