diff options
Diffstat (limited to 'sync/internal_api/public')
48 files changed, 139 insertions, 141 deletions
diff --git a/sync/internal_api/public/base_node.h b/sync/internal_api/public/base_node.h index dfcd2a8..4b1924f 100644 --- a/sync/internal_api/public/base_node.h +++ b/sync/internal_api/public/base_node.h @@ -42,7 +42,7 @@ class ThemeSpecifics; class TypedUrlSpecifics; } -namespace csync { +namespace syncer { class BaseTransaction; @@ -250,6 +250,6 @@ class BaseNode { DISALLOW_COPY_AND_ASSIGN(BaseNode); }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ diff --git a/sync/internal_api/public/base_transaction.h b/sync/internal_api/public/base_transaction.h index 6e96a04..067239b 100644 --- a/sync/internal_api/public/base_transaction.h +++ b/sync/internal_api/public/base_transaction.h @@ -15,7 +15,7 @@ class BaseTransaction; class Directory; } -namespace csync { +namespace syncer { // Sync API's BaseTransaction, ReadTransaction, and WriteTransaction allow for // batching of several read and/or write operations. The read and write @@ -28,7 +28,7 @@ class BaseTransaction { public: // Provide access to the underlying syncable objects from BaseNode. virtual syncable::BaseTransaction* GetWrappedTrans() const = 0; - csync::Cryptographer* GetCryptographer() const; + syncer::Cryptographer* GetCryptographer() const; syncable::Directory* GetDirectory() const { return directory_; @@ -47,8 +47,8 @@ class BaseTransaction { }; syncable::ModelTypeSet GetEncryptedTypes( - const csync::BaseTransaction* trans); + const syncer::BaseTransaction* trans); -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_BASE_TRANSACTION_H_ diff --git a/sync/internal_api/public/change_record.h b/sync/internal_api/public/change_record.h index 90a21a0..5b27285 100644 --- a/sync/internal_api/public/change_record.h +++ b/sync/internal_api/public/change_record.h @@ -17,7 +17,7 @@ namespace base { class DictionaryValue; } // namespace base -namespace csync { +namespace syncer { // TODO(zea): One day get passwords playing nicely with the rest of encryption // and get rid of this. @@ -60,8 +60,8 @@ struct ChangeRecord { typedef std::vector<ChangeRecord> ChangeRecordList; -typedef csync::Immutable<ChangeRecordList> ImmutableChangeRecordList; +typedef syncer::Immutable<ChangeRecordList> ImmutableChangeRecordList; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_CHANGE_RECORD_H_ diff --git a/sync/internal_api/public/change_record_unittest.cc b/sync/internal_api/public/change_record_unittest.cc index 132a880..b46ab99 100644 --- a/sync/internal_api/public/change_record_unittest.cc +++ b/sync/internal_api/public/change_record_unittest.cc @@ -14,7 +14,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { namespace { using base::ExpectDictDictionaryValue; @@ -61,7 +61,7 @@ void CheckChangeRecordValue( EXPECT_TRUE(Value::Equals(extra_value, expected_extra_value.get())); scoped_ptr<DictionaryValue> expected_specifics_value( - csync::EntitySpecificsToValue(record.specifics)); + syncer::EntitySpecificsToValue(record.specifics)); ExpectDictDictionaryValue(*expected_specifics_value, value, "specifics"); } @@ -134,4 +134,4 @@ TEST_F(ChangeRecordTest, ChangeRecordToValue) { } } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/configure_reason.h b/sync/internal_api/public/configure_reason.h index 934c0e9..be77472 100644 --- a/sync/internal_api/public/configure_reason.h +++ b/sync/internal_api/public/configure_reason.h @@ -6,7 +6,7 @@ #define SYNC_INTERNAL_API_PUBLIC_CONFIGURE_REASON_H_ #pragma once -namespace csync { +namespace syncer { // Note: This should confirm with the enums in sync.proto for // GetUpdatesCallerInfo. They will have 1:1 mapping but this will only map @@ -31,6 +31,6 @@ enum ConfigureReason { CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_CONFIGURE_REASON_H_ diff --git a/sync/internal_api/public/engine/model_safe_worker.cc b/sync/internal_api/public/engine/model_safe_worker.cc index f82b451..0bde89b 100644 --- a/sync/internal_api/public/engine/model_safe_worker.cc +++ b/sync/internal_api/public/engine/model_safe_worker.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" -namespace csync { +namespace syncer { base::DictionaryValue* ModelSafeRoutingInfoToValue( const ModelSafeRoutingInfo& routing_info) { @@ -72,4 +72,4 @@ std::string ModelSafeGroupToString(ModelSafeGroup group) { ModelSafeWorker::~ModelSafeWorker() {} -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/engine/model_safe_worker.h b/sync/internal_api/public/engine/model_safe_worker.h index e1d6563..a78a322 100644 --- a/sync/internal_api/public/engine/model_safe_worker.h +++ b/sync/internal_api/public/engine/model_safe_worker.h @@ -19,7 +19,7 @@ namespace base { class DictionaryValue; } // namespace -namespace csync { +namespace syncer { typedef base::Callback<enum SyncerError(void)> WorkCallback; @@ -82,6 +82,6 @@ syncable::ModelTypeSet GetRoutingInfoTypes( ModelSafeGroup GetGroupForModelType(const syncable::ModelType type, const ModelSafeRoutingInfo& routes); -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_ diff --git a/sync/internal_api/public/engine/model_safe_worker_unittest.cc b/sync/internal_api/public/engine/model_safe_worker_unittest.cc index a8580e1..550c1b2 100644 --- a/sync/internal_api/public/engine/model_safe_worker_unittest.cc +++ b/sync/internal_api/public/engine/model_safe_worker_unittest.cc @@ -8,7 +8,7 @@ #include "base/values.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { namespace { class ModelSafeWorkerTest : public ::testing::Test { @@ -52,4 +52,4 @@ TEST_F(ModelSafeWorkerTest, GetRoutingInfoTypes) { } } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/engine/passive_model_worker.cc b/sync/internal_api/public/engine/passive_model_worker.cc index f33488e..10d20ee 100644 --- a/sync/internal_api/public/engine/passive_model_worker.cc +++ b/sync/internal_api/public/engine/passive_model_worker.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" -namespace csync { +namespace syncer { PassiveModelWorker::PassiveModelWorker(const MessageLoop* sync_loop) : sync_loop_(sync_loop) {} @@ -25,4 +25,4 @@ ModelSafeGroup PassiveModelWorker::GetModelSafeGroup() { return GROUP_PASSIVE; } -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/engine/passive_model_worker.h b/sync/internal_api/public/engine/passive_model_worker.h index bb0870a..1ef9864 100644 --- a/sync/internal_api/public/engine/passive_model_worker.h +++ b/sync/internal_api/public/engine/passive_model_worker.h @@ -13,7 +13,7 @@ class MessageLoop; -namespace csync { +namespace syncer { // Implementation of ModelSafeWorker for passive types. All work is // done on the same thread DoWorkAndWaitUntilDone (i.e., the sync @@ -35,6 +35,6 @@ class PassiveModelWorker : public ModelSafeWorker { DISALLOW_COPY_AND_ASSIGN(PassiveModelWorker); }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_PASSIVE_MODEL_WORKER_H_ diff --git a/sync/internal_api/public/engine/polling_constants.cc b/sync/internal_api/public/engine/polling_constants.cc index bebf180..d65994b 100644 --- a/sync/internal_api/public/engine/polling_constants.cc +++ b/sync/internal_api/public/engine/polling_constants.cc @@ -5,7 +5,7 @@ #include "base/basictypes.h" #include "sync/internal_api/public/engine/polling_constants.h" -namespace csync { +namespace syncer { // Server can overwrite these values via client commands. // Standard short poll. This is used when XMPP is off. @@ -22,5 +22,5 @@ const int64 kMaxBackoffSeconds = 60 * 60 * 4; // 4 hours. // Backoff interval randomization factor. const int kBackoffRandomizationFactor = 2; -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/engine/polling_constants.h b/sync/internal_api/public/engine/polling_constants.h index cb7f5f5..94b375b 100644 --- a/sync/internal_api/public/engine/polling_constants.h +++ b/sync/internal_api/public/engine/polling_constants.h @@ -8,13 +8,13 @@ #define SYNC_INTERNAL_API_PUBLIC_ENGINE_POLLING_CONSTANTS_H_ #pragma once -namespace csync { +namespace syncer { extern const int64 kDefaultShortPollIntervalSeconds; extern const int64 kDefaultLongPollIntervalSeconds; extern const int64 kMaxBackoffSeconds; extern const int kBackoffRandomizationFactor; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_POLLING_CONSTANTS_H_ diff --git a/sync/internal_api/public/engine/sync_status.cc b/sync/internal_api/public/engine/sync_status.cc index 7d17269..9ed3bf3 100644 --- a/sync/internal_api/public/engine/sync_status.cc +++ b/sync/internal_api/public/engine/sync_status.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/engine/sync_status.h" -namespace csync { +namespace syncer { SyncStatus::SyncStatus() : notifications_enabled(false), @@ -36,4 +36,4 @@ SyncStatus::SyncStatus() SyncStatus::~SyncStatus() { } -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/engine/sync_status.h b/sync/internal_api/public/engine/sync_status.h index 3ded90c..cb15adc 100644 --- a/sync/internal_api/public/engine/sync_status.h +++ b/sync/internal_api/public/engine/sync_status.h @@ -10,7 +10,7 @@ #include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/sync_protocol_error.h" -namespace csync { +namespace syncer { // Status encapsulates detailed state about the internals of the SyncManager. // @@ -29,7 +29,7 @@ struct SyncStatus { // Notifications counters updated by the actions in synapi. int notifications_received; - csync::SyncProtocolError sync_protocol_error; + syncer::SyncProtocolError sync_protocol_error; // Number of encryption conflicts counted during most recent sync cycle. int encryption_conflicts; @@ -91,6 +91,6 @@ struct SyncStatus { std::string unique_id; }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_STATUS_SUMMARY_H_ diff --git a/sync/internal_api/public/http_bridge.h b/sync/internal_api/public/http_bridge.h index cec5526..74eaa2c 100644 --- a/sync/internal_api/public/http_bridge.h +++ b/sync/internal_api/public/http_bridge.h @@ -38,7 +38,7 @@ namespace browser_sync { // It is RefCountedThreadSafe because it can PostTask to the io loop, and thus // needs to stick around across context switches, etc. class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, - public csync::HttpPostProviderInterface, + public syncer::HttpPostProviderInterface, public net::URLFetcherDelegate { public: // A request context used for HTTP requests bridged from the sync backend. @@ -98,7 +98,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, explicit HttpBridge(RequestContextGetter* context); - // csync::HttpPostProvider implementation. + // syncer::HttpPostProvider implementation. virtual void SetExtraRequestHeaders(const char* headers) OVERRIDE; virtual void SetURL(const char* url, int port) OVERRIDE; virtual void SetPostPayload(const char* content_type, int content_length, @@ -205,16 +205,16 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, DISALLOW_COPY_AND_ASSIGN(HttpBridge); }; -class HttpBridgeFactory : public csync::HttpPostProviderFactory { +class HttpBridgeFactory : public syncer::HttpPostProviderFactory { public: HttpBridgeFactory( net::URLRequestContextGetter* baseline_context_getter, const std::string& user_agent); virtual ~HttpBridgeFactory(); - // csync::HttpPostProviderFactory: - virtual csync::HttpPostProviderInterface* Create() OVERRIDE; - virtual void Destroy(csync::HttpPostProviderInterface* http) OVERRIDE; + // syncer::HttpPostProviderFactory: + virtual syncer::HttpPostProviderInterface* Create() OVERRIDE; + virtual void Destroy(syncer::HttpPostProviderInterface* http) OVERRIDE; private: // This request context is built on top of the baseline context and shares diff --git a/sync/internal_api/public/http_post_provider_factory.h b/sync/internal_api/public/http_post_provider_factory.h index 709008d..8c5a991 100644 --- a/sync/internal_api/public/http_post_provider_factory.h +++ b/sync/internal_api/public/http_post_provider_factory.h @@ -6,7 +6,7 @@ #define SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_FACTORY_H_ #pragma once -namespace csync { +namespace syncer { class HttpPostProviderInterface; @@ -29,6 +29,6 @@ class HttpPostProviderFactory { virtual void Destroy(HttpPostProviderInterface* http) = 0; }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_FACTORY_H_ diff --git a/sync/internal_api/public/http_post_provider_interface.h b/sync/internal_api/public/http_post_provider_interface.h index 378e18f..3f5e74e 100644 --- a/sync/internal_api/public/http_post_provider_interface.h +++ b/sync/internal_api/public/http_post_provider_interface.h @@ -8,7 +8,7 @@ #include <string> -namespace csync { +namespace syncer { // An interface the embedding application (e.g. Chromium) implements to provide // required HTTP POST functionality to the syncer backend. This interface is @@ -58,6 +58,6 @@ class HttpPostProviderInterface { virtual ~HttpPostProviderInterface() {} }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_INTERFACE_H_ diff --git a/sync/internal_api/public/read_node.h b/sync/internal_api/public/read_node.h index a4bd40f..c2a9428 100644 --- a/sync/internal_api/public/read_node.h +++ b/sync/internal_api/public/read_node.h @@ -13,7 +13,7 @@ #include "sync/internal_api/public/base_node.h" #include "sync/internal_api/public/syncable/model_type.h" -namespace csync { +namespace syncer { // ReadNode wraps a syncable::Entry to provide the functionality of a // read-only BaseNode. @@ -61,6 +61,6 @@ class ReadNode : public BaseNode { DISALLOW_COPY_AND_ASSIGN(ReadNode); }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_READ_NODE_H_ diff --git a/sync/internal_api/public/read_transaction.h b/sync/internal_api/public/read_transaction.h index ba5610b..b7bcff3 100644 --- a/sync/internal_api/public/read_transaction.h +++ b/sync/internal_api/public/read_transaction.h @@ -12,7 +12,7 @@ namespace tracked_objects { class Location; } // namespace tracked_objects -namespace csync { +namespace syncer { struct UserShare; @@ -41,6 +41,6 @@ class ReadTransaction : public BaseTransaction { DISALLOW_COPY_AND_ASSIGN(ReadTransaction); }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_READ_TRANSACTION_H_ diff --git a/sync/internal_api/public/sessions/model_neutral_state.cc b/sync/internal_api/public/sessions/model_neutral_state.cc index 82d9a35..b25d3c7 100644 --- a/sync/internal_api/public/sessions/model_neutral_state.cc +++ b/sync/internal_api/public/sessions/model_neutral_state.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/sessions/model_neutral_state.h" -namespace csync { +namespace syncer { namespace sessions { ModelNeutralState::ModelNeutralState() @@ -26,4 +26,4 @@ ModelNeutralState::ModelNeutralState() ModelNeutralState::~ModelNeutralState() {} } // namespace sessions -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h index c9f93c8..fa127b0 100644 --- a/sync/internal_api/public/sessions/model_neutral_state.h +++ b/sync/internal_api/public/sessions/model_neutral_state.h @@ -11,7 +11,7 @@ #include "sync/protocol/sync.pb.h" #include "sync/protocol/sync_protocol_error.h" -namespace csync { +namespace syncer { namespace sessions { // Grouping of all state that applies to all model types. Note that some @@ -69,6 +69,6 @@ struct ModelNeutralState { }; } // namespace sessions -} // namespace csync +} // namespace syncer #endif // SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_ diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc index 6c6de86..74fba25 100644 --- a/sync/internal_api/public/sessions/sync_session_snapshot.cc +++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc @@ -7,7 +7,7 @@ #include "base/json/json_writer.h" #include "base/values.h" -namespace csync { +namespace syncer { namespace sessions { SyncSessionSnapshot::SyncSessionSnapshot() @@ -170,4 +170,4 @@ bool SyncSessionSnapshot::retry_scheduled() const { } } // namespace sessions -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.h b/sync/internal_api/public/sessions/sync_session_snapshot.h index 1ec188f..9029132 100644 --- a/sync/internal_api/public/sessions/sync_session_snapshot.h +++ b/sync/internal_api/public/sessions/sync_session_snapshot.h @@ -19,7 +19,7 @@ namespace base { class DictionaryValue; } -namespace csync { +namespace syncer { namespace sessions { // An immutable snapshot of state from a SyncSession. Convenient to use as @@ -91,6 +91,6 @@ class SyncSessionSnapshot { }; } // namespace sessions -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_ diff --git a/sync/internal_api/public/sessions/sync_source_info.cc b/sync/internal_api/public/sessions/sync_source_info.cc index 1b6d72d..e4536ee 100644 --- a/sync/internal_api/public/sessions/sync_source_info.cc +++ b/sync/internal_api/public/sessions/sync_source_info.cc @@ -7,7 +7,7 @@ #include "base/values.h" #include "sync/protocol/proto_enum_conversions.h" -namespace csync { +namespace syncer { namespace sessions { SyncSourceInfo::SyncSourceInfo() @@ -33,4 +33,4 @@ DictionaryValue* SyncSourceInfo::ToValue() const { } } // namespace sessions -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/sessions/sync_source_info.h b/sync/internal_api/public/sessions/sync_source_info.h index cbd66d0..6902b26 100644 --- a/sync/internal_api/public/sessions/sync_source_info.h +++ b/sync/internal_api/public/sessions/sync_source_info.h @@ -15,7 +15,7 @@ namespace base { class DictionaryValue; } -namespace csync { +namespace syncer { namespace sessions { // A container for the source of a sync session. This includes the update @@ -37,6 +37,6 @@ struct SyncSourceInfo { }; } // namespace sessions -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SOURCE_INFO_H_ diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h index 3a2cf2e..3b7164d 100644 --- a/sync/internal_api/public/sync_manager.h +++ b/sync/internal_api/public/sync_manager.h @@ -25,7 +25,7 @@ #include "sync/internal_api/public/util/weak_handle.h" #include "sync/protocol/sync_protocol_error.h" -namespace csync { +namespace syncer { class Encryptor; struct Experiments; class ExtensionsActivityMonitor; @@ -35,17 +35,17 @@ class JsEventHandler; namespace sessions { class SyncSessionSnapshot; } // namespace sessions -} // namespace csync +} // namespace syncer -namespace csync { +namespace syncer { class SyncNotifier; -} // namespace csync +} // namespace syncer namespace sync_pb { class EncryptedData; } // namespace sync_pb -namespace csync { +namespace syncer { class BaseTransaction; class HttpPostProviderFactory; @@ -58,7 +58,7 @@ enum ConnectionStatus { CONNECTION_SERVER_ERROR }; -// Reasons due to which csync::Cryptographer might require a passphrase. +// Reasons due to which syncer::Cryptographer might require a passphrase. enum PassphraseRequiredReason { REASON_PASSPHRASE_NOT_REQUIRED = 0, // Initial value. REASON_ENCRYPTION = 1, // The cryptographer requires a @@ -184,7 +184,7 @@ class SyncManager { // A round-trip sync-cycle took place and the syncer has resolved any // conflicts that may have arisen. virtual void OnSyncCycleCompleted( - const csync::sessions::SyncSessionSnapshot& snapshot) = 0; + const syncer::sessions::SyncSessionSnapshot& snapshot) = 0; // Called when the status of the connection to the sync server has // changed. @@ -300,7 +300,7 @@ class SyncManager { // function getChildNodeIds(id); virtual void OnInitializationComplete( - const csync::WeakHandle<csync::JsBackend>& + const syncer::WeakHandle<syncer::JsBackend>& js_backend, bool success) = 0; // We are no longer permitted to communicate with the server. Sync should @@ -334,7 +334,7 @@ class SyncManager { virtual void OnEncryptionComplete() = 0; virtual void OnActionableError( - const csync::SyncProtocolError& sync_protocol_error) = 0; + const syncer::SyncProtocolError& sync_protocol_error) = 0; protected: virtual ~Observer(); @@ -372,26 +372,26 @@ class SyncManager { // TODO(akalin): Replace the |post_factory| parameter with a // URLFetcher parameter. bool Init(const FilePath& database_location, - const csync::WeakHandle<csync::JsEventHandler>& + const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, const std::string& sync_server_and_path, int sync_server_port, bool use_ssl, const scoped_refptr<base::TaskRunner>& blocking_task_runner, HttpPostProviderFactory* post_factory, - const csync::ModelSafeRoutingInfo& model_safe_routing_info, - const std::vector<csync::ModelSafeWorker*>& workers, - csync::ExtensionsActivityMonitor* + const syncer::ModelSafeRoutingInfo& model_safe_routing_info, + const std::vector<syncer::ModelSafeWorker*>& workers, + syncer::ExtensionsActivityMonitor* extensions_activity_monitor, ChangeDelegate* change_delegate, const SyncCredentials& credentials, - csync::SyncNotifier* sync_notifier, + syncer::SyncNotifier* sync_notifier, const std::string& restored_key_for_bootstrapping, TestingMode testing_mode, - csync::Encryptor* encryptor, - csync::UnrecoverableErrorHandler* + syncer::Encryptor* encryptor, + syncer::UnrecoverableErrorHandler* unrecoverable_error_handler, - csync::ReportUnrecoverableErrorFunction + syncer::ReportUnrecoverableErrorFunction report_unrecoverable_error_function); // Throw an unrecoverable error from a transaction (mostly used for @@ -409,7 +409,7 @@ class SyncManager { // Put the syncer in normal mode ready to perform nudges and polls. void StartSyncingNormally( - const csync::ModelSafeRoutingInfo& routing_info); + const syncer::ModelSafeRoutingInfo& routing_info); // Attempts to re-encrypt encrypted data types using the passphrase provided. // Notifies observers of the result of the operation via OnPassphraseAccepted @@ -436,12 +436,12 @@ class SyncManager { // Switches the mode of operation to CONFIGURATION_MODE and // schedules a config task to fetch updates for |types|. - void RequestConfig(const csync::ModelSafeRoutingInfo& routing_info, + void RequestConfig(const syncer::ModelSafeRoutingInfo& routing_info, const syncable::ModelTypeSet& types, - csync::ConfigureReason reason); + syncer::ConfigureReason reason); void RequestCleanupDisabledTypes( - const csync::ModelSafeRoutingInfo& routing_info); + const syncer::ModelSafeRoutingInfo& routing_info); // Adds a listener to be notified of sync events. // NOTE: It is OK (in fact, it's probably a good idea) to call this before @@ -516,7 +516,7 @@ class SyncManager { // Reads the nigori node to determine if any experimental features should // be enabled. // Note: opens a transaction. May be called on any thread. - bool ReceivedExperiment(csync::Experiments* experiments) const; + bool ReceivedExperiment(syncer::Experiments* experiments) const; // Uses a read-only transaction to determine if the directory being synced has // any remaining unsynced items. May be called on any thread. @@ -555,13 +555,13 @@ bool InitialSyncEndedForTypes(syncable::ModelTypeSet types, UserShare* share); syncable::ModelTypeSet GetTypesWithEmptyProgressMarkerToken( syncable::ModelTypeSet types, - csync::UserShare* share); + syncer::UserShare* share); const char* ConnectionStatusToString(ConnectionStatus status); // Returns the string representation of a PassphraseRequiredReason value. const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason); -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_ diff --git a/sync/internal_api/public/syncable/model_type.h b/sync/internal_api/public/syncable/model_type.h index c8a9905..e134ee6 100644 --- a/sync/internal_api/public/syncable/model_type.h +++ b/sync/internal_api/public/syncable/model_type.h @@ -90,9 +90,9 @@ enum ModelType { MODEL_TYPE_COUNT, }; -typedef csync::EnumSet< +typedef syncer::EnumSet< ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE> ModelTypeSet; -typedef csync::EnumSet< +typedef syncer::EnumSet< ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE> FullModelTypeSet; inline ModelType ModelTypeFromInt(int i) { diff --git a/sync/internal_api/public/syncable/model_type_payload_map.cc b/sync/internal_api/public/syncable/model_type_payload_map.cc index b803b39..97646b7c 100644 --- a/sync/internal_api/public/syncable/model_type_payload_map.cc +++ b/sync/internal_api/public/syncable/model_type_payload_map.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" -using csync::ModelSafeRoutingInfo; +using syncer::ModelSafeRoutingInfo; namespace syncable { ModelTypePayloadMap ModelTypePayloadMapFromEnumSet( @@ -36,10 +36,10 @@ ModelTypeSet ModelTypePayloadMapToEnumSet( } ModelTypePayloadMap ModelTypePayloadMapFromRoutingInfo( - const csync::ModelSafeRoutingInfo& routes, + const syncer::ModelSafeRoutingInfo& routes, const std::string& payload) { ModelTypePayloadMap types_with_payloads; - for (csync::ModelSafeRoutingInfo::const_iterator i = routes.begin(); + for (syncer::ModelSafeRoutingInfo::const_iterator i = routes.begin(); i != routes.end(); ++i) { types_with_payloads[i->first] = payload; } diff --git a/sync/internal_api/public/syncable/model_type_payload_map.h b/sync/internal_api/public/syncable/model_type_payload_map.h index 8f3319a..5ea9919 100644 --- a/sync/internal_api/public/syncable/model_type_payload_map.h +++ b/sync/internal_api/public/syncable/model_type_payload_map.h @@ -37,7 +37,7 @@ ModelTypeSet ModelTypePayloadMapToEnumSet( // Make a TypePayloadMap for all the enabled types in a // ModelSafeRoutingInfo using a default payload. ModelTypePayloadMap ModelTypePayloadMapFromRoutingInfo( - const csync::ModelSafeRoutingInfo& routes, + const syncer::ModelSafeRoutingInfo& routes, const std::string& payload); std::string ModelTypePayloadMapToString( @@ -53,7 +53,7 @@ void CoalescePayloads(ModelTypePayloadMap* original, const ModelTypePayloadMap& update); void PurgeStalePayload(ModelTypePayloadMap* original, - const csync::ModelSafeRoutingInfo& routing_info); + const syncer::ModelSafeRoutingInfo& routing_info); } // namespace syncable diff --git a/sync/internal_api/public/test/test_entry_factory.h b/sync/internal_api/public/test/test_entry_factory.h index 9eed71d..bb96f2f 100644 --- a/sync/internal_api/public/test/test_entry_factory.h +++ b/sync/internal_api/public/test/test_entry_factory.h @@ -16,7 +16,7 @@ class Directory; class Id; } -namespace csync { +namespace syncer { class TestEntryFactory { public: @@ -65,6 +65,6 @@ class TestEntryFactory { DISALLOW_COPY_AND_ASSIGN(TestEntryFactory); }; -} // namespace csync +} // namespace syncer #endif // SYNC_TEST_TEST_ENTRY_FACTORY_H_ diff --git a/sync/internal_api/public/test/test_user_share.h b/sync/internal_api/public/test/test_user_share.h index 3c11d49..0fb1503 100644 --- a/sync/internal_api/public/test/test_user_share.h +++ b/sync/internal_api/public/test/test_user_share.h @@ -3,7 +3,7 @@ // found in the LICENSE file. // // A handy class that takes care of setting up and destroying a -// csync::UserShare instance for unit tests that require one. +// syncer::UserShare instance for unit tests that require one. // // The expected usage is to make this a component of your test fixture: // @@ -22,7 +22,7 @@ // Then, in your tests: // // TEST_F(AwesomenessTest, IsMaximal) { -// csync::ReadTransaction trans(test_user_share_.user_share()); +// syncer::ReadTransaction trans(test_user_share_.user_share()); // ... // } // @@ -34,7 +34,7 @@ #include "base/basictypes.h" #include "sync/internal_api/public/user_share.h" -namespace csync { +namespace syncer { class TestDirectorySetterUpper; @@ -54,15 +54,15 @@ class TestUserShare { void TearDown(); // Non-NULL iff called between a call to SetUp() and TearDown(). - csync::UserShare* user_share(); + syncer::UserShare* user_share(); private: scoped_ptr<TestDirectorySetterUpper> dir_maker_; - scoped_ptr<csync::UserShare> user_share_; + scoped_ptr<syncer::UserShare> user_share_; DISALLOW_COPY_AND_ASSIGN(TestUserShare); }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_TEST_TEST_USER_SHARE_H_ diff --git a/sync/internal_api/public/user_share.h b/sync/internal_api/public/user_share.h index 95eb7f2..d7936a4 100644 --- a/sync/internal_api/public/user_share.h +++ b/sync/internal_api/public/user_share.h @@ -14,7 +14,7 @@ namespace syncable { class Directory; } -namespace csync { +namespace syncer { // A UserShare encapsulates the syncable pieces that represent an authenticated // user and their data (share). @@ -31,6 +31,6 @@ struct UserShare { std::string name; }; -} +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_USER_SHARE_H_ diff --git a/sync/internal_api/public/util/enum_set.h b/sync/internal_api/public/util/enum_set.h index 1a989ed..911ad12 100644 --- a/sync/internal_api/public/util/enum_set.h +++ b/sync/internal_api/public/util/enum_set.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/logging.h" -namespace csync { +namespace syncer { // Forward declarations needed for friend declarations. template <typename E, E MinEnumValue, E MaxEnumValue> @@ -281,6 +281,6 @@ EnumSet<E, Min, Max> Difference(EnumSet<E, Min, Max> set1, return EnumSet<E, Min, Max>(set1.enums_ & ~set2.enums_); } -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_UTIL_ENUM_SET_H_ diff --git a/sync/internal_api/public/util/enum_set_unittest.cc b/sync/internal_api/public/util/enum_set_unittest.cc index 1f6223c..5f222c6 100644 --- a/sync/internal_api/public/util/enum_set_unittest.cc +++ b/sync/internal_api/public/util/enum_set_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { namespace { enum TestEnum { @@ -192,4 +192,4 @@ TEST_F(EnumSetTest, Difference) { } } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h index f13c09a..c6febe8 100644 --- a/sync/internal_api/public/util/experiments.h +++ b/sync/internal_api/public/util/experiments.h @@ -8,7 +8,7 @@ #include "sync/internal_api/public/syncable/model_type.h" -namespace csync { +namespace syncer { // A structure to hold the enable status of experimental sync features. struct Experiments { @@ -23,6 +23,6 @@ struct Experiments { bool sync_tab_favicons; }; -} +} // namespace syncer #endif // SYNC_UTIL_EXPERIMENTS_ diff --git a/sync/internal_api/public/util/immutable.h b/sync/internal_api/public/util/immutable.h index 3c20a4f..1742c0e 100644 --- a/sync/internal_api/public/util/immutable.h +++ b/sync/internal_api/public/util/immutable.h @@ -26,7 +26,7 @@ // undesirable. Here's the above code re-written using Immutable<T>: // // void ProcessStuff( -// const csync::Immutable<LargeObjectList>& stuff) { +// const syncer::Immutable<LargeObjectList>& stuff) { // for (LargeObjectList::const_iterator it = stuff.Get().begin(); // it != stuff.Get().end(); ++it) { // ... process it ... @@ -72,7 +72,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -namespace csync { +namespace syncer { namespace internal { // This class is part of the Immutable implementation. DO NOT USE @@ -257,6 +257,6 @@ Immutable<T> MakeImmutable(T* t) { return Immutable<T>(t); } -} // namespace csync +} // namespace syncer #endif // SYNC_UTIL_IMMUTABLE_H_ diff --git a/sync/internal_api/public/util/immutable_unittest.cc b/sync/internal_api/public/util/immutable_unittest.cc index e124b70..f8494b6 100644 --- a/sync/internal_api/public/util/immutable_unittest.cc +++ b/sync/internal_api/public/util/immutable_unittest.cc @@ -16,7 +16,7 @@ #include "base/memory/ref_counted.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { // Helper class that keeps track of the token passed in at // construction and how many times that token is copied. @@ -102,20 +102,20 @@ void swap(ADLToken& t1, ADLToken& t2) { t1.Swap(&t2); } -} // namespace csync +} // namespace syncer // Allowed by the standard (17.4.3.1/1). namespace std { template <> -void swap(csync::SpecializationToken& t1, - csync::SpecializationToken& t2) { +void swap(syncer::SpecializationToken& t1, + syncer::SpecializationToken& t2) { t1.Swap(&t2); } } // namespace -namespace csync { +namespace syncer { namespace { class ImmutableTest : public ::testing::Test {}; @@ -247,4 +247,4 @@ TEST_F(ImmutableTest, Set) { } } // namespace -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/util/report_unrecoverable_error_function.h b/sync/internal_api/public/util/report_unrecoverable_error_function.h index dfe00a8..a6aec0f2 100644 --- a/sync/internal_api/public/util/report_unrecoverable_error_function.h +++ b/sync/internal_api/public/util/report_unrecoverable_error_function.h @@ -6,7 +6,7 @@ #define SYNC_UTIL_REPORT_UNRECOVERABLE_ERROR_FUNCTION_H_ #pragma once -namespace csync { +namespace syncer { // A ReportUnrecoverableErrorFunction is a function that is called // immediately when an unrecoverable error is encountered. Unlike @@ -14,6 +14,6 @@ namespace csync { // context surrounding it. typedef void (*ReportUnrecoverableErrorFunction)(void); -} // namespace csync +} // namespace syncer #endif // SYNC_UTIL_REPORT_UNRECOVERABLE_ERROR_FUNCTION_H_ diff --git a/sync/internal_api/public/util/syncer_error.cc b/sync/internal_api/public/util/syncer_error.cc index 57cd4ed..d77821d 100644 --- a/sync/internal_api/public/util/syncer_error.cc +++ b/sync/internal_api/public/util/syncer_error.cc @@ -6,7 +6,7 @@ #include "base/logging.h" -namespace csync { +namespace syncer { #define ENUM_CASE(x) case x: return #x; break; const char* GetSyncerErrorString(SyncerError value) { @@ -32,5 +32,4 @@ const char* GetSyncerErrorString(SyncerError value) { } #undef ENUM_CASE -} // namespace csync - +} // namespace syncer diff --git a/sync/internal_api/public/util/syncer_error.h b/sync/internal_api/public/util/syncer_error.h index 8df8afd..f895066 100644 --- a/sync/internal_api/public/util/syncer_error.h +++ b/sync/internal_api/public/util/syncer_error.h @@ -6,7 +6,7 @@ #define SYNC_INTERNAL_API_PUBLIC_UTIL_SYNCER_ERROR_H_ #pragma once -namespace csync { +namespace syncer { // This enum describes all the ways a SyncerCommand can fail. // @@ -41,6 +41,6 @@ enum SyncerError { const char * GetSyncerErrorString(SyncerError); -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_UTIL_SYNCER_ERROR_H_ diff --git a/sync/internal_api/public/util/unrecoverable_error_handler.h b/sync/internal_api/public/util/unrecoverable_error_handler.h index a96a487..82644ee 100644 --- a/sync/internal_api/public/util/unrecoverable_error_handler.h +++ b/sync/internal_api/public/util/unrecoverable_error_handler.h @@ -10,7 +10,7 @@ #include "base/location.h" -namespace csync { +namespace syncer { class UnrecoverableErrorHandler { public: @@ -24,7 +24,6 @@ class UnrecoverableErrorHandler { virtual ~UnrecoverableErrorHandler() { } }; -} +} // namespace syncer #endif // SYNC_UTIL_UNRECOVERABLE_ERROR_HANDLER_H_ - diff --git a/sync/internal_api/public/util/unrecoverable_error_info.cc b/sync/internal_api/public/util/unrecoverable_error_info.cc index ae17d2f..2234650 100644 --- a/sync/internal_api/public/util/unrecoverable_error_info.cc +++ b/sync/internal_api/public/util/unrecoverable_error_info.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/util/unrecoverable_error_info.h" -namespace csync { +namespace syncer { UnrecoverableErrorInfo::UnrecoverableErrorInfo() : is_set_(false) { @@ -41,4 +41,4 @@ const std::string& UnrecoverableErrorInfo::message() const { return message_; } -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/util/unrecoverable_error_info.h b/sync/internal_api/public/util/unrecoverable_error_info.h index 6e8af72..912b51e 100644 --- a/sync/internal_api/public/util/unrecoverable_error_info.h +++ b/sync/internal_api/public/util/unrecoverable_error_info.h @@ -12,7 +12,7 @@ #include "base/location.h" -namespace csync { +namespace syncer { class UnrecoverableErrorInfo { public: @@ -36,6 +36,6 @@ class UnrecoverableErrorInfo { bool is_set_; }; -} // namespace csync +} // namespace syncer #endif // SYNC_UTIL_UNRECOVERABLE_ERROR_INFO_H_ diff --git a/sync/internal_api/public/util/weak_handle.cc b/sync/internal_api/public/util/weak_handle.cc index 9de3f9b..e6411ee 100644 --- a/sync/internal_api/public/util/weak_handle.cc +++ b/sync/internal_api/public/util/weak_handle.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/message_loop_proxy.h" -namespace csync { +namespace syncer { namespace internal { @@ -33,4 +33,4 @@ void WeakHandleCoreBase::PostToOwnerThread( } // namespace internal -} // namespace base +} // namespace syncer diff --git a/sync/internal_api/public/util/weak_handle.h b/sync/internal_api/public/util/weak_handle.h index fc7909e..9441949 100644 --- a/sync/internal_api/public/util/weak_handle.h +++ b/sync/internal_api/public/util/weak_handle.h @@ -68,7 +68,7 @@ namespace tracked_objects { class Location; } // namespace tracked_objects -namespace csync { +namespace syncer { template <typename T> class WeakHandle; @@ -286,7 +286,7 @@ class WeakHandle { // Note that this doesn't override the regular copy constructor, so // that one can be called on any thread. template <typename U> - WeakHandle(const csync::WeakHandle<U>& other) // NOLINT + WeakHandle(const syncer::WeakHandle<U>& other) // NOLINT : core_( other.IsInitialized() ? new internal::WeakHandleCore<T>(other.Get()) : @@ -374,6 +374,6 @@ WeakHandle<T> MakeWeakHandle(const base::WeakPtr<T>& ptr) { return WeakHandle<T>(ptr); } -} // namespace csync +} // namespace syncer #endif // SYNC_UTIL_WEAK_HANDLE_H_ diff --git a/sync/internal_api/public/util/weak_handle_unittest.cc b/sync/internal_api/public/util/weak_handle_unittest.cc index 67c7b20..c770a29 100644 --- a/sync/internal_api/public/util/weak_handle_unittest.cc +++ b/sync/internal_api/public/util/weak_handle_unittest.cc @@ -13,7 +13,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace csync { +namespace syncer { using ::testing::_; using ::testing::SaveArg; @@ -323,4 +323,4 @@ TEST_F(WeakHandleTest, TypeConversionConstructorUninitializedAssignment) { EXPECT_FALSE(base_weak_handle.IsInitialized()); } -} // namespace csync +} // namespace syncer diff --git a/sync/internal_api/public/write_node.h b/sync/internal_api/public/write_node.h index c99b3a0..b113187 100644 --- a/sync/internal_api/public/write_node.h +++ b/sync/internal_api/public/write_node.h @@ -14,7 +14,7 @@ #include "sync/internal_api/public/base_node.h" #include "sync/internal_api/public/syncable/model_type.h" -namespace csync { +namespace syncer { class Cryptographer; class TestBookmarkModelAssociator; } @@ -38,7 +38,7 @@ class ThemeSpecifics; class TypedUrlSpecifics; } -namespace csync { +namespace syncer { class WriteTransaction; @@ -199,6 +199,6 @@ class WriteNode : public BaseNode { DISALLOW_COPY_AND_ASSIGN(WriteNode); }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_WRITE_NODE_H_ diff --git a/sync/internal_api/public/write_transaction.h b/sync/internal_api/public/write_transaction.h index b2de9a1..e72ae71 100644 --- a/sync/internal_api/public/write_transaction.h +++ b/sync/internal_api/public/write_transaction.h @@ -18,7 +18,7 @@ namespace tracked_objects { class Location; } // namespace tracked_objects -namespace csync { +namespace syncer { // Sync API's WriteTransaction is a read/write BaseTransaction. It wraps // a syncable::WriteTransaction. @@ -52,6 +52,6 @@ class WriteTransaction : public BaseTransaction { DISALLOW_COPY_AND_ASSIGN(WriteTransaction); }; -} // namespace csync +} // namespace syncer #endif // SYNC_INTERNAL_API_PUBLIC_WRITE_TRANSACTION_H_ |