[Sync] Move sync/{internal_api,syncable} into syncer namespace

chrome/browser/sync/profile_sync_service_autofill_unittest.cc

 // Copyright (c) 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 <set>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 50 matching lines @@
 
 using base::Time;
 using base::TimeDelta;
 using base::WaitableEvent;
 using browser_sync::AutofillDataTypeController;
 using browser_sync::AutofillProfileDataTypeController;
 using browser_sync::DataTypeController;
 using browser_sync::GenericChangeProcessor;
 using browser_sync::SharedChangeProcessor;
 using content::BrowserThread;
-using syncable::AUTOFILL;
-using syncable::BASE_VERSION;
-using syncable::CREATE;
-using syncable::GET_BY_SERVER_TAG;
-using syncable::MutableEntry;
-using syncable::SERVER_SPECIFICS;
-using syncable::SPECIFICS;
-using syncable::UNITTEST;
-using syncable::WriterTag;
-using syncable::WriteTransaction;
+using syncer::syncable::AUTOFILL;
+using syncer::syncable::BASE_VERSION;
+using syncer::syncable::CREATE;
+using syncer::syncable::GET_BY_SERVER_TAG;
+using syncer::syncable::MutableEntry;
+using syncer::syncable::SERVER_SPECIFICS;
+using syncer::syncable::SPECIFICS;
+using syncer::syncable::UNITTEST;
+using syncer::syncable::WriterTag;
+using syncer::syncable::WriteTransaction;
 using syncer::BaseNode;
 using testing::_;
 using testing::DoAll;
 using testing::ElementsAre;
 using testing::SetArgumentPointee;
 using testing::Return;
 
 namespace syncable {
 class Id;
 }
@@ skipping 534 matching lines @@
 
   base::Closure callback_;
   bool success_;
 };
 
 // Overload write transaction to use custom NotifyTransactionComplete
 class WriteTransactionTest: public WriteTransaction {
  public:
   WriteTransactionTest(const tracked_objects::Location& from_here,
                        WriterTag writer,
-                       syncable::Directory* directory,
+                       syncer::syncable::Directory* directory,
                        scoped_ptr<WaitableEvent>* wait_for_syncapi)
       : WriteTransaction(from_here, writer, directory),
         wait_for_syncapi_(wait_for_syncapi) { }
 
   virtual void NotifyTransactionComplete(
       syncable::ModelTypeSet types) OVERRIDE {
     // This is where we differ. Force a thread change here, giving another
     // thread a chance to create a WriteTransaction
     (*wait_for_syncapi_)->Wait();
 
@@ skipping 15 matching lines @@
         service_(service),
         wait_for_start_(wait_for_start),
         wait_for_syncapi_(wait_for_syncapi),
         is_finished_(false, false) { }
 
   void Update() {
     // This gets called in a modelsafeworker thread.
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
     syncer::UserShare* user_share = service_->GetUserShare();
-    syncable::Directory* directory = user_share->directory.get();
+    syncer::syncable::Directory* directory = user_share->directory.get();
 
     // Create autofill protobuf.
     std::string tag = AutocompleteSyncableService::KeyToTag(
         UTF16ToUTF8(entry_.key().name()), UTF16ToUTF8(entry_.key().value()));
     sync_pb::AutofillSpecifics new_autofill;
     new_autofill.set_name(UTF16ToUTF8(entry_.key().name()));
     new_autofill.set_value(UTF16ToUTF8(entry_.key().value()));
     const std::vector<base::Time>& ts(entry_.timestamps());
     for (std::vector<base::Time>::const_iterator timestamp = ts.begin();
          timestamp != ts.end(); ++timestamp) {
       new_autofill.add_usage_timestamp(timestamp->ToInternalValue());
     }
 
     sync_pb::EntitySpecifics entity_specifics;
     entity_specifics.mutable_autofill()->CopyFrom(new_autofill);
 
     {
       // Tell main thread we've started
       (*wait_for_start_)->Signal();
 
       // Create write transaction.
       WriteTransactionTest trans(FROM_HERE, UNITTEST, directory,
                                  wait_for_syncapi_);
 
       // Create actual entry based on autofill protobuf information.
       // Simulates effects of UpdateLocalDataFromServerData
       MutableEntry parent(&trans, GET_BY_SERVER_TAG,
                           syncable::ModelTypeToRootTag(syncable::AUTOFILL));
-      MutableEntry item(&trans, CREATE, parent.Get(syncable::ID), tag);
+      MutableEntry item(&trans, CREATE, parent.Get(syncer::syncable::ID), tag);
       ASSERT_TRUE(item.good());
       item.Put(SPECIFICS, entity_specifics);
       item.Put(SERVER_SPECIFICS, entity_specifics);
       item.Put(BASE_VERSION, 1);
-      syncable::Id server_item_id = service_->id_factory()->NewServerId();
-      item.Put(syncable::ID, server_item_id);
-      syncable::Id new_predecessor;
+      syncer::syncable::Id server_item_id =
+          service_->id_factory()->NewServerId();
+      item.Put(syncer::syncable::ID, server_item_id);
+      syncer::syncable::Id new_predecessor;
       ASSERT_TRUE(item.PutPredecessor(new_predecessor));
     }
     DVLOG(1) << "FakeServerUpdater finishing.";
     is_finished_.Signal();
   }
 
   void CreateNewEntry(const AutofillEntry& entry) {
     entry_ = entry;
     ASSERT_FALSE(BrowserThread::CurrentlyOn(BrowserThread::DB));
     if (!BrowserThread::PostTask(
@@ skipping 18 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<FakeServerUpdater>;
   ~FakeServerUpdater() { }
 
   AutofillEntry entry_;
   TestProfileSyncService* service_;
   scoped_ptr<WaitableEvent>* wait_for_start_;
   scoped_ptr<WaitableEvent>* wait_for_syncapi_;
   WaitableEvent is_finished_;
-  syncable::Id parent_id_;
+  syncer::syncable::Id parent_id_;
 };
 
 namespace {
 
 // Checks if the field of type |field_type| in |profile1| includes all values
 // of the field in |profile2|.
 bool IncludesField(const AutofillProfile& profile1,
                    const AutofillProfile& profile2,
                    AutofillFieldType field_type) {
   std::vector<string16> values1;
@@ skipping 494 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
              << ", " << sync_entries[i].key().value();
   }
 }