Change includes of histogram.h to histogram_macros.h.

components/sync/engine_impl/apply_control_data_updates.cc

 // Copyright 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 "components/sync/engine_impl/apply_control_data_updates.h"
 
 #include <stdint.h>
 
 #include <vector>
 
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "components/sync/base/cryptographer.h"
 #include "components/sync/engine_impl/conflict_resolver.h"
 #include "components/sync/engine_impl/conflict_util.h"
 #include "components/sync/engine_impl/syncer_util.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/mutable_entry.h"
 #include "components/sync/syncable/nigori_handler.h"
 #include "components/sync/syncable/nigori_util.h"
 #include "components/sync/syncable/syncable_write_transaction.h"
 
@@ skipping 187 matching lines @@
                               ConflictResolver::OVERWRITE_LOCAL,
                               ConflictResolver::CONFLICT_RESOLUTION_SIZE);
   }
 
   UpdateAttemptResponse response =
       AttemptToUpdateEntry(trans, entry, cryptographer);
   DCHECK_EQ(SUCCESS, response);
 }
 
 }  // namespace syncer