diff options
Diffstat (limited to 'sync')
43 files changed, 112 insertions, 112 deletions
diff --git a/sync/engine/apply_control_data_updates.cc b/sync/engine/apply_control_data_updates.cc index 09778c3..fa71824 100644 --- a/sync/engine/apply_control_data_updates.cc +++ b/sync/engine/apply_control_data_updates.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -12,7 +12,7 @@ #include "sync/syncable/mutable_entry.h" #include "sync/syncable/nigori_handler.h" #include "sync/syncable/nigori_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/cryptographer.h" namespace syncer { diff --git a/sync/engine/apply_control_data_updates_unittest.cc b/sync/engine/apply_control_data_updates_unittest.cc index 754bac3..9bd1914 100644 --- a/sync/engine/apply_control_data_updates_unittest.cc +++ b/sync/engine/apply_control_data_updates_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -13,9 +13,9 @@ #include "sync/protocol/nigori_specifics.pb.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/nigori_util.h" -#include "sync/syncable/read_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/syncer_command_test.h" #include "sync/test/engine/test_id_factory.h" diff --git a/sync/engine/apply_updates_and_resolve_conflicts_command.cc b/sync/engine/apply_updates_and_resolve_conflicts_command.cc index 971f90d..214fb39 100644 --- a/sync/engine/apply_updates_and_resolve_conflicts_command.cc +++ b/sync/engine/apply_updates_and_resolve_conflicts_command.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -9,8 +9,8 @@ #include "sync/engine/update_applicator.h" #include "sync/sessions/sync_session.h" #include "sync/syncable/directory.h" -#include "sync/syncable/read_transaction.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" namespace syncer { diff --git a/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc b/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc index fb6480a..97d4c33 100644 --- a/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc +++ b/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -13,10 +13,10 @@ #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/protocol/password_specifics.pb.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/syncable_id.h" +#include "sync/syncable/syncable_read_transaction.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/syncer_command_test.h" #include "sync/test/engine/test_id_factory.h" diff --git a/sync/engine/build_commit_command.cc b/sync/engine/build_commit_command.cc index bfa5b9c..7ecf152 100644 --- a/sync/engine/build_commit_command.cc +++ b/sync/engine/build_commit_command.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -19,7 +19,7 @@ #include "sync/syncable/mutable_entry.h" #include "sync/syncable/syncable_changes_version.h" #include "sync/syncable/syncable_proto_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/time.h" // TODO(vishwath): Remove this include after node positions have diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc index 49443e9..59dbc2d 100644 --- a/sync/engine/commit.cc +++ b/sync/engine/commit.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -11,7 +11,7 @@ #include "sync/engine/syncer_proto_util.h" #include "sync/sessions/sync_session.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" namespace syncer { diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc index 4d91b0f..6e2eddd 100644 --- a/sync/engine/conflict_resolver.cc +++ b/sync/engine/conflict_resolver.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -14,7 +14,7 @@ #include "sync/sessions/status_controller.h" #include "sync/syncable/directory.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/cryptographer.h" using std::list; diff --git a/sync/engine/download_updates_command.cc b/sync/engine/download_updates_command.cc index d3accdc..8e3a5cd 100644 --- a/sync/engine/download_updates_command.cc +++ b/sync/engine/download_updates_command.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -12,7 +12,7 @@ #include "sync/internal_api/public/base/model_type_invalidation_map.h" #include "sync/syncable/directory.h" #include "sync/syncable/nigori_handler.h" -#include "sync/syncable/read_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" using sync_pb::DebugInfo; diff --git a/sync/engine/get_commit_ids_command.cc b/sync/engine/get_commit_ids_command.cc index bb6d228..4997239 100644 --- a/sync/engine/get_commit_ids_command.cc +++ b/sync/engine/get_commit_ids_command.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -15,7 +15,7 @@ #include "sync/syncable/nigori_handler.h" #include "sync/syncable/nigori_util.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/cryptographer.h" using std::set; diff --git a/sync/engine/process_commit_response_command.cc b/sync/engine/process_commit_response_command.cc index 811be36..b5b1b81 100644 --- a/sync/engine/process_commit_response_command.cc +++ b/sync/engine/process_commit_response_command.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -16,10 +16,10 @@ #include "sync/sessions/sync_session.h" #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/syncable_proto_util.h" +#include "sync/syncable/syncable_read_transaction.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/time.h" // TODO(vishwath): Remove this include after node positions have diff --git a/sync/engine/process_commit_response_command_unittest.cc b/sync/engine/process_commit_response_command_unittest.cc index 482036d..f20f86c 100644 --- a/sync/engine/process_commit_response_command_unittest.cc +++ b/sync/engine/process_commit_response_command_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -13,10 +13,10 @@ #include "sync/sessions/sync_session.h" #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/syncable_id.h" #include "sync/syncable/syncable_proto_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/syncer_command_test.h" #include "sync/test/engine/test_id_factory.h" diff --git a/sync/engine/process_updates_command.cc b/sync/engine/process_updates_command.cc index 15a14cb..87533c5 100644 --- a/sync/engine/process_updates_command.cc +++ b/sync/engine/process_updates_command.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -16,7 +16,7 @@ #include "sync/syncable/mutable_entry.h" #include "sync/syncable/syncable_proto_util.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/cryptographer.h" // TODO(vishwath): Remove this include after node positions have diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index df41960..2bfcdf8 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. // @@ -41,9 +41,9 @@ #include "sync/sessions/sync_session_context.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/nigori_util.h" -#include "sync/syncable/read_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/mock_connection_manager.h" #include "sync/test/engine/test_directory_setter_upper.h" diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc index b88bc7c..afbea45 100644 --- a/sync/engine/syncer_util.cc +++ b/sync/engine/syncer_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -21,11 +21,11 @@ #include "sync/syncable/directory.h" #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/syncable_changes_version.h" #include "sync/syncable/syncable_proto_util.h" +#include "sync/syncable/syncable_read_transaction.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/cryptographer.h" #include "sync/util/time.h" diff --git a/sync/engine/update_applicator.cc b/sync/engine/update_applicator.cc index e9fcac4..828f8c6 100644 --- a/sync/engine/update_applicator.cc +++ b/sync/engine/update_applicator.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -11,7 +11,7 @@ #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/syncable_id.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" using std::vector; diff --git a/sync/internal_api/change_reorder_buffer.cc b/sync/internal_api/change_reorder_buffer.cc index 5188309..e6e4e2f 100644 --- a/sync/internal_api/change_reorder_buffer.cc +++ b/sync/internal_api/change_reorder_buffer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -11,9 +11,9 @@ #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/read_node.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/directory.h" #include "sync/syncable/entry.h" +#include "sync/syncable/syncable_base_transaction.h" using std::numeric_limits; using std::pair; diff --git a/sync/internal_api/read_node.cc b/sync/internal_api/read_node.cc index 84fe4b5..2873b0d 100644 --- a/sync/internal_api/read_node.cc +++ b/sync/internal_api/read_node.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -6,8 +6,8 @@ #include "base/logging.h" #include "sync/internal_api/public/base_transaction.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/entry.h" +#include "sync/syncable/syncable_base_transaction.h" namespace syncer { diff --git a/sync/internal_api/read_transaction.cc b/sync/internal_api/read_transaction.cc index 6de2f42..81e5340 100644 --- a/sync/internal_api/read_transaction.cc +++ b/sync/internal_api/read_transaction.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. #include "sync/internal_api/public/read_transaction.h" #include "sync/syncable/directory.h" -#include "sync/syncable/read_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" namespace syncer { diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc index 852f5b6..82b75b8 100644 --- a/sync/internal_api/sync_encryption_handler_impl.cc +++ b/sync/internal_api/sync_encryption_handler_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -24,10 +24,10 @@ #include "sync/protocol/encryption.pb.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/protocol/sync.pb.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/directory.h" #include "sync/syncable/entry.h" #include "sync/syncable/nigori_util.h" +#include "sync/syncable/syncable_base_transaction.h" #include "sync/util/cryptographer.h" #include "sync/util/encryptor.h" #include "sync/util/time.h" diff --git a/sync/internal_api/sync_encryption_handler_impl_unittest.cc b/sync/internal_api/sync_encryption_handler_impl_unittest.cc index 74bf0e42..872e423 100644 --- a/sync/internal_api/sync_encryption_handler_impl_unittest.cc +++ b/sync/internal_api/sync_encryption_handler_impl_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -21,7 +21,7 @@ #include "sync/protocol/sync.pb.h" #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/test_id_factory.h" #include "sync/test/fake_encryptor.h" #include "sync/util/cryptographer.h" diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index 7e4ef7d..d27b56e 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -61,9 +61,9 @@ #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/nigori_util.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/syncable_id.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/callback_counter.h" #include "sync/test/engine/fake_sync_scheduler.h" #include "sync/test/fake_encryptor.h" diff --git a/sync/internal_api/test/test_entry_factory.cc b/sync/internal_api/test/test_entry_factory.cc index f578412..8e6b2b3 100644 --- a/sync/internal_api/test/test_entry_factory.cc +++ b/sync/internal_api/test/test_entry_factory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -7,9 +7,9 @@ #include "sync/syncable/directory.h" #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/syncable_id.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/test_id_factory.h" using std::string; diff --git a/sync/internal_api/test/test_user_share.cc b/sync/internal_api/test/test_user_share.cc index a6147c4..2057eac 100644 --- a/sync/internal_api/test/test_user_share.cc +++ b/sync/internal_api/test/test_user_share.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "sync/syncable/directory.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/test_directory_setter_upper.h" #include "sync/test/engine/test_id_factory.h" #include "sync/test/engine/test_syncable_utils.h" diff --git a/sync/internal_api/write_transaction.cc b/sync/internal_api/write_transaction.cc index cf0f121..d33093da 100644 --- a/sync/internal_api/write_transaction.cc +++ b/sync/internal_api/write_transaction.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. #include "sync/internal_api/public/write_transaction.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" namespace syncer { diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc index aaa8150..6a32754 100644 --- a/sync/sessions/sync_session_unittest.cc +++ b/sync/sessions/sync_session_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -14,7 +14,7 @@ #include "sync/internal_api/public/base/model_type_invalidation_map_test_util.h" #include "sync/sessions/status_controller.h" #include "sync/syncable/syncable_id.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/test_directory_setter_upper.h" #include "sync/test/fake_extensions_activity_monitor.h" diff --git a/sync/sync.gyp b/sync/sync.gyp index 475f86b..aacc629 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright 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. @@ -126,8 +126,6 @@ 'sessions/sync_session.h', 'sessions/sync_session_context.cc', 'sessions/sync_session_context.h', - 'syncable/base_transaction.cc', - 'syncable/base_transaction.h', 'syncable/blob.h', 'syncable/dir_open_result.h', 'syncable/directory.cc', @@ -153,10 +151,10 @@ 'syncable/nigori_util.h', 'syncable/on_disk_directory_backing_store.cc', 'syncable/on_disk_directory_backing_store.h', - 'syncable/read_transaction.cc', - 'syncable/read_transaction.h', 'syncable/scoped_kernel_lock.h', 'syncable/syncable-inl.h', + 'syncable/syncable_base_transaction.cc', + 'syncable/syncable_base_transaction.h', 'syncable/syncable_changes_version.h', 'syncable/syncable_columns.h', 'syncable/syncable_enum_conversions.cc', @@ -165,11 +163,13 @@ 'syncable/syncable_id.h', 'syncable/syncable_proto_util.cc', 'syncable/syncable_proto_util.h', + 'syncable/syncable_read_transaction.cc', + 'syncable/syncable_read_transaction.h', 'syncable/syncable_util.cc', 'syncable/syncable_util.h', + 'syncable/syncable_write_transaction.cc', + 'syncable/syncable_write_transaction.h', 'syncable/transaction_observer.h', - 'syncable/write_transaction.cc', - 'syncable/write_transaction.h', 'syncable/write_transaction_info.cc', 'syncable/write_transaction_info.h', 'util/cryptographer.cc', diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc index 82eb709c..c9b5132 100644 --- a/sync/syncable/directory.cc +++ b/sync/syncable/directory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -10,17 +10,17 @@ #include "base/string_number_conversions.h" #include "sync/internal_api/public/base/node_ordinal.h" #include "sync/internal_api/public/util/unrecoverable_error_handler.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/entry.h" #include "sync/syncable/entry_kernel.h" #include "sync/syncable/in_memory_directory_backing_store.h" #include "sync/syncable/on_disk_directory_backing_store.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/scoped_index_updater.h" #include "sync/syncable/syncable-inl.h" +#include "sync/syncable/syncable_base_transaction.h" #include "sync/syncable/syncable_changes_version.h" +#include "sync/syncable/syncable_read_transaction.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" using std::string; diff --git a/sync/syncable/entry.cc b/sync/syncable/entry.cc index a0c8a4a..07ec19a 100644 --- a/sync/syncable/entry.cc +++ b/sync/syncable/entry.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -7,9 +7,9 @@ #include <iomanip> #include "base/json/string_escape.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/blob.h" #include "sync/syncable/directory.h" +#include "sync/syncable/syncable_base_transaction.h" #include "sync/syncable/syncable_columns.h" using std::string; diff --git a/sync/syncable/mutable_entry.cc b/sync/syncable/mutable_entry.cc index 5090ad1a9..143881d 100644 --- a/sync/syncable/mutable_entry.cc +++ b/sync/syncable/mutable_entry.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -12,7 +12,7 @@ #include "sync/syncable/syncable-inl.h" #include "sync/syncable/syncable_changes_version.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" using std::string; diff --git a/sync/syncable/nigori_util.cc b/sync/syncable/nigori_util.cc index 01aaa86..b0fee50 100644 --- a/sync/syncable/nigori_util.cc +++ b/sync/syncable/nigori_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -14,7 +14,7 @@ #include "sync/syncable/nigori_handler.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/util/cryptographer.h" namespace syncer { diff --git a/sync/syncable/base_transaction.cc b/sync/syncable/syncable_base_transaction.cc index 233da88..0404d94 100644 --- a/sync/syncable/base_transaction.cc +++ b/sync/syncable/syncable_base_transaction.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. -#include "sync/syncable/base_transaction.h" +#include "sync/syncable/syncable_base_transaction.h" #include "base/debug/trace_event.h" #include "sync/syncable/directory.h" diff --git a/sync/syncable/base_transaction.h b/sync/syncable/syncable_base_transaction.h index 80b9630..4e9a220 100644 --- a/sync/syncable/base_transaction.h +++ b/sync/syncable/syncable_base_transaction.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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 SYNC_SYNCABLE_BASE_TRANSACTION_H_ -#define SYNC_SYNCABLE_BASE_TRANSACTION_H_ +#ifndef SYNC_SYNCABLE_SYNCABLE_BASE_TRANSACTION_H_ +#define SYNC_SYNCABLE_SYNCABLE_BASE_TRANSACTION_H_ #include "base/location.h" #include "sync/syncable/syncable_id.h" @@ -79,4 +79,4 @@ class BaseTransaction { } // namespace syncable } // namespace syncer -#endif // SYNC_SYNCABLE_BASE_TRANSACTION_H_ +#endif // SYNC_SYNCABLE_SYNCABLE_BASE_TRANSACTION_H_ diff --git a/sync/syncable/syncable_mock.h b/sync/syncable/syncable_mock.h index eb4ac27..089bd31 100644 --- a/sync/syncable/syncable_mock.h +++ b/sync/syncable/syncable_mock.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -8,7 +8,7 @@ #include <string> #include "sync/syncable/directory.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/null_directory_change_delegate.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/syncable/read_transaction.cc b/sync/syncable/syncable_read_transaction.cc index 9fb635e..fcdb77e 100644 --- a/sync/syncable/read_transaction.cc +++ b/sync/syncable/syncable_read_transaction.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. -#include "sync/syncable/read_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" namespace syncer { namespace syncable { diff --git a/sync/syncable/read_transaction.h b/sync/syncable/syncable_read_transaction.h index cd3aded..276e930 100644 --- a/sync/syncable/read_transaction.h +++ b/sync/syncable/syncable_read_transaction.h @@ -1,11 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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 SYNC_SYNCABLE_READ_TRANSACTION_H_ -#define SYNC_SYNCABLE_READ_TRANSACTION_H_ +#ifndef SYNC_SYNCABLE_SYNCABLE_READ_TRANSACTION_H_ +#define SYNC_SYNCABLE_SYNCABLE_READ_TRANSACTION_H_ -#include "sync/syncable/base_transaction.h" +#include "sync/syncable/syncable_base_transaction.h" namespace syncer { class ReadTransaction; @@ -29,4 +29,4 @@ class ReadTransaction : public BaseTransaction { } // namespace syncable } // namespace syncer -#endif // SYNC_SYNCABLE_READ_TRANSACTION_H_ +#endif // SYNC_SYNCABLE_SYNCABLE_READ_TRANSACTION_H_ diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc index c366901..89ea175 100644 --- a/sync/syncable/syncable_unittest.cc +++ b/sync/syncable/syncable_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -26,10 +26,10 @@ #include "sync/syncable/metahandle_set.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/on_disk_directory_backing_store.h" -#include "sync/syncable/read_transaction.h" #include "sync/syncable/syncable_proto_util.h" +#include "sync/syncable/syncable_read_transaction.h" #include "sync/syncable/syncable_util.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/test_id_factory.h" #include "sync/test/engine/test_syncable_utils.h" #include "sync/test/fake_encryptor.h" diff --git a/sync/syncable/syncable_util.cc b/sync/syncable/syncable_util.cc index 1bfe6ff..36d08d0 100644 --- a/sync/syncable/syncable_util.cc +++ b/sync/syncable/syncable_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -10,7 +10,7 @@ #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/syncable_id.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" namespace syncer { namespace syncable { diff --git a/sync/syncable/write_transaction.cc b/sync/syncable/syncable_write_transaction.cc index bbd9dc4..71fb289 100644 --- a/sync/syncable/write_transaction.cc +++ b/sync/syncable/syncable_write_transaction.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/syncable/directory.h" #include "sync/syncable/directory_change_delegate.h" diff --git a/sync/syncable/write_transaction.h b/sync/syncable/syncable_write_transaction.h index 875f6ec..d45ee5f 100644 --- a/sync/syncable/write_transaction.h +++ b/sync/syncable/syncable_write_transaction.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_SYNCABLE_WRITE_TRANSACTION_H_ -#define SYNC_SYNCABLE_WRITE_TRANSACTION_H_ +#ifndef SYNC_SYNCABLE_SYNCABLE_WRITE_TRANSACTION_H_ +#define SYNC_SYNCABLE_SYNCABLE_WRITE_TRANSACTION_H_ #include "sync/base/sync_export.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/entry_kernel.h" +#include "sync/syncable/syncable_base_transaction.h" namespace syncer { namespace syncable { @@ -65,4 +65,4 @@ class WriteTransaction : public BaseTransaction { } // namespace syncable } // namespace syncer -#endif // SYNC_SYNCABLE_WRITE_TRANSACTION_H_ +#endif // SYNC_SYNCABLE_SYNCABLE_WRITE_TRANSACTION_H_ diff --git a/sync/syncable/write_transaction_info.h b/sync/syncable/write_transaction_info.h index 2bbe739..823a66c 100644 --- a/sync/syncable/write_transaction_info.h +++ b/sync/syncable/write_transaction_info.h @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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 SYNC_SYNCABLE_WRITE_TRANSACTION_INFO_H_ #define SYNC_SYNCABLE_WRITE_TRANSACTION_INFO_H_ -#include "sync/syncable/base_transaction.h" #include "sync/syncable/entry_kernel.h" +#include "sync/syncable/syncable_base_transaction.h" namespace syncer { namespace syncable { diff --git a/sync/test/engine/mock_connection_manager.cc b/sync/test/engine/mock_connection_manager.cc index 7441420..afdd62d 100644 --- a/sync/test/engine/mock_connection_manager.cc +++ b/sync/test/engine/mock_connection_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. // @@ -14,7 +14,7 @@ #include "sync/test/engine/test_id_factory.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/syncable/directory.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/test_id_factory.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc index e302299..ee0e240 100644 --- a/sync/test/engine/test_directory_setter_upper.cc +++ b/sync/test/engine/test_directory_setter_upper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -11,8 +11,8 @@ #include "sync/syncable/directory.h" #include "sync/syncable/in_memory_directory_backing_store.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/read_transaction.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_read_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/test_transaction_observer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/test/engine/test_syncable_utils.cc b/sync/test/engine/test_syncable_utils.cc index e5ff285..77be4c3 100644 --- a/sync/test/engine/test_syncable_utils.cc +++ b/sync/test/engine/test_syncable_utils.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 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. @@ -6,11 +6,11 @@ #include "sync/test/engine/test_syncable_utils.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/directory.h" #include "sync/syncable/entry.h" #include "sync/syncable/mutable_entry.h" -#include "sync/syncable/write_transaction.h" +#include "sync/syncable/syncable_base_transaction.h" +#include "sync/syncable/syncable_write_transaction.h" #include "sync/test/engine/test_id_factory.h" using std::string; |