[Sync] //components/sync external changes [DO NOT SUBMIT]

components/sync_driver/model_association_manager.cc

 // Copyright 2014 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_driver/model_association_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <functional>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
-#include "sync/api/sync_merge_result.h"
-#include "sync/internal_api/public/base/model_type.h"
+#include "components/sync/api/sync_merge_result.h"
+#include "components/sync/base/model_type.h"
 
 using syncer::ModelTypeSet;
 
 namespace sync_driver {
 
 namespace {
 
 static const syncer::ModelType kStartOrder[] = {
   syncer::NIGORI,               //  Listed for completeness.
   syncer::DEVICE_INFO,          //  Listed for completeness.
@@ skipping 423 matching lines @@
       // At least one type is not ready.
       return;
     }
   }
 
   notified_about_ready_for_configure_ = true;
   delegate_->OnAllDataTypesReadyForConfigure();
 }
 
 }  // namespace sync_driver