[Sync] Renaming sync/api* to sync/model*.

components/sync/model/conflict_resolution.cc

 // Copyright 2016 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 "components/sync/api/conflict_resolution.h"
+#include "components/sync/model/conflict_resolution.h"
 
 #include <utility>
 
 namespace syncer {
 
 // static
 ConflictResolution ConflictResolution::UseLocal() {
   return ConflictResolution(USE_LOCAL, nullptr);
 }
 
@@ skipping 18 matching lines @@
   // Has data if and only if type is USE_NEW.
   DCHECK((type_ == USE_NEW) == !!data_);
   return std::move(data_);
 }
 
 ConflictResolution::ConflictResolution(Type type,
                                        std::unique_ptr<EntityData> data)
     : type_(type), data_(std::move(data)) {}
 
 }  // namespace syncer