[Sync] Move //components/sync to the syncer namespace, take 2.

components/sync/syncable/model_neutral_mutable_entry.h

 // Copyright 2013 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_MODEL_NEUTRAL_MUTABLE_ENTRY_H_
 #define COMPONENTS_SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/syncable/entry.h"
 
 namespace syncer {
+
 class WriteNode;
 
 namespace syncable {
 
 class BaseWriteTransaction;
 
 enum CreateNewUpdateItem { CREATE_NEW_UPDATE_ITEM };
 
 enum CreateNewTypeRoot { CREATE_NEW_TYPE_ROOT };
 
@@ skipping 70 matching lines @@
   // used its list of mutations by the time this function is called.
   void UpdateTransactionVersion(int64_t version);
 
  protected:
   explicit ModelNeutralMutableEntry(BaseWriteTransaction* trans);
 
   void MarkDirty();
 
  private:
   friend class syncer::WriteNode;
-  friend class Directory;
+  friend class syncer::syncable::Directory;
 
   // Don't allow creation on heap, except by sync API wrappers.
   void* operator new(size_t size) { return (::operator new)(size); }
 
   // Kind of redundant. We should reduce the number of pointers
   // floating around if at all possible. Could we store this in Directory?
   // Scope: Set on construction, never changed after that.
   BaseWriteTransaction* const base_write_transaction_;
 
   DISALLOW_COPY_AND_ASSIGN(ModelNeutralMutableEntry);
 };
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_