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

components/sync/sessions_impl/status_controller.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 "sync/sessions/status_controller.h"
+#include "components/sync/sessions_impl/status_controller.h"
 
 #include <vector>
 
-#include "sync/internal_api/public/base/model_type.h"
-#include "sync/protocol/sync_protocol_error.h"
+#include "components/sync/base/model_type.h"
+#include "components/sync/protocol/sync_protocol_error.h"
 
 namespace syncer {
 namespace sessions {
 
-StatusController::StatusController() {
-}
+StatusController::StatusController() {}
 
 StatusController::~StatusController() {}
 
 const ModelTypeSet StatusController::get_updates_request_types() const {
   return model_neutral_.get_updates_request_types;
 }
 
 void StatusController::set_get_updates_request_types(ModelTypeSet value) {
   model_neutral_.get_updates_request_types = value;
 }
@@ skipping 108 matching lines @@
 int StatusController::TotalNumConflictingItems() const {
   int sum = 0;
   sum += num_encryption_conflicts();
   sum += num_hierarchy_conflicts();
   sum += num_server_conflicts();
   return sum;
 }
 
 }  // namespace sessions
 }  // namespace syncer