Index: components/sync/syncable/syncable_base_transaction.cc |
diff --git a/sync/syncable/syncable_base_transaction.cc b/components/sync/syncable/syncable_base_transaction.cc |
similarity index 75% |
rename from sync/syncable/syncable_base_transaction.cc |
rename to components/sync/syncable/syncable_base_transaction.cc |
index c145c1f339c22b582e2a3d3a29f2b1fbf6de18a3..28f7905ed0874dc7f141ca6dcccf1bcbd6c6d474 100644 |
--- a/sync/syncable/syncable_base_transaction.cc |
+++ b/components/sync/syncable/syncable_base_transaction.cc |
@@ -2,10 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "sync/syncable/syncable_base_transaction.h" |
+#include "components/sync/syncable/syncable_base_transaction.h" |
#include "base/trace_event/trace_event.h" |
-#include "sync/syncable/directory.h" |
+#include "components/sync/syncable/directory.h" |
namespace syncer { |
namespace syncable { |
@@ -20,9 +20,8 @@ Directory* BaseTransaction::directory() const { |
} |
void BaseTransaction::Lock() { |
- TRACE_EVENT2("sync_lock_contention", "AcquireLock", |
- "src_file", from_here_.file_name(), |
- "src_func", from_here_.function_name()); |
+ TRACE_EVENT2("sync_lock_contention", "AcquireLock", "src_file", |
+ from_here_.file_name(), "src_func", from_here_.function_name()); |
directory_->kernel()->transaction_mutex.Acquire(); |
} |
@@ -51,9 +50,8 @@ bool BaseTransaction::unrecoverable_error_set() const { |
void BaseTransaction::HandleUnrecoverableErrorIfSet() { |
if (unrecoverable_error_set_) { |
- directory()->OnUnrecoverableError(this, |
- unrecoverable_error_location_, |
- unrecoverable_error_msg_); |
+ directory()->OnUnrecoverableError(this, unrecoverable_error_location_, |
+ unrecoverable_error_msg_); |
} |
} |
@@ -61,13 +59,15 @@ BaseTransaction::BaseTransaction(const tracked_objects::Location& from_here, |
const char* name, |
WriterTag writer, |
Directory* directory) |
- : from_here_(from_here), name_(name), writer_(writer), |
- directory_(directory), unrecoverable_error_set_(false) { |
+ : from_here_(from_here), |
+ name_(name), |
+ writer_(writer), |
+ directory_(directory), |
+ unrecoverable_error_set_(false) { |
// TODO(lipalani): Don't issue a good transaction if the directory has |
// unrecoverable error set. And the callers have to check trans.good before |
// proceeding. |
- TRACE_EVENT_BEGIN2("sync", name_, |
- "src_file", from_here_.file_name(), |
+ TRACE_EVENT_BEGIN2("sync", name_, "src_file", from_here_.file_name(), |
"src_func", from_here_.function_name()); |
} |