| Index: chrome/browser/sync/syncable/syncable.h
|
| diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h
|
| index 3a1b3797e0713f3e733ecd73ce76314fa0f1e6c3..9310d923d028ec5b921c79cb0ccfceded02ddad8 100644
|
| --- a/chrome/browser/sync/syncable/syncable.h
|
| +++ b/chrome/browser/sync/syncable/syncable.h
|
| @@ -18,12 +18,12 @@
|
| #include "base/basictypes.h"
|
| #include "base/file_path.h"
|
| #include "base/gtest_prod_util.h"
|
| +#include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/observer_list_threadsafe.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/time.h"
|
| -#include "base/tracked.h"
|
| #include "chrome/browser/sync/protocol/sync.pb.h"
|
| #include "chrome/browser/sync/syncable/blob.h"
|
| #include "chrome/browser/sync/syncable/dir_open_result.h"
|
| @@ -443,7 +443,7 @@ class Entry {
|
| friend class sync_api::ReadNode;
|
| void* operator new(size_t size) { return (::operator new)(size); }
|
|
|
| - inline Entry(BaseTransaction* trans)
|
| + inline explicit Entry(BaseTransaction* trans)
|
| : basetrans_(trans),
|
| kernel_(NULL) { }
|
|
|
|
|