Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/syncable/entry_kernel.h

 // 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 COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_
 #define COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
-#include <memory>
 #include <set>
 #include <string>
 
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/sync/base/immutable.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/proto_value_ptr.h"
 #include "components/sync/base/time.h"
 #include "components/sync/base/unique_position.h"
@@ skipping 165 matching lines @@
   // and was therefore in the middle of a commit operation.
   // Note: must only be set if SYNCING is true.
   DIRTY_SYNC,
   BIT_TEMPS_END,
 };
 
 enum { BIT_TEMPS_COUNT = BIT_TEMPS_END - BIT_TEMPS_BEGIN };
 
 struct EntryKernel {
  private:
-  typedef ProtoValuePtr<sync_pb::EntitySpecifics> EntitySpecificsPtr;
-  typedef ProtoValuePtr<sync_pb::AttachmentMetadata> AttachmentMetadataPtr;
+  typedef syncer::ProtoValuePtr<sync_pb::EntitySpecifics> EntitySpecificsPtr;
+  typedef syncer::ProtoValuePtr<sync_pb::AttachmentMetadata>
+      AttachmentMetadataPtr;
 
   std::string string_fields[STRING_FIELDS_COUNT];
   EntitySpecificsPtr specifics_fields[PROTO_FIELDS_COUNT];
   int64_t int64_fields[INT64_FIELDS_COUNT];
   base::Time time_fields[TIME_FIELDS_COUNT];
   Id id_fields[ID_FIELDS_COUNT];
   UniquePosition unique_position_fields[UNIQUE_POSITION_FIELDS_COUNT];
   AttachmentMetadataPtr
       attachment_metadata_fields[ATTACHMENT_METADATA_FIELDS_COUNT];
   std::bitset<BIT_FIELDS_COUNT> bit_fields;
@@ skipping 202 matching lines @@
 
 std::unique_ptr<base::ListValue> EntryKernelMutationMapToValue(
     const EntryKernelMutationMap& mutations);
 
 std::ostream& operator<<(std::ostream& os, const EntryKernel& entry_kernel);
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_