Change includes of histogram.h to histogram_macros.h.

crypto/mock_apple_keychain.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 "crypto/mock_apple_keychain.h"
+
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
-#include "crypto/mock_apple_keychain.h"
 
 namespace {
 
 // Adds an entry to a local histogram to indicate that the Apple Keychain would
 // have been accessed, if this class were not a mock of the Apple Keychain.
 void IncrementKeychainAccessHistogram() {
   // This local histogram is accessed by Telemetry to track the number of times
   // the keychain is accessed, since keychain access is known to be synchronous
   // and slow.
   LOCAL_HISTOGRAM_BOOLEAN("OSX.Keychain.Access", true);
@@ skipping 56 matching lines @@
                   passwordLength);
   return noErr;
 }
 
 std::string MockAppleKeychain::GetEncryptionPassword() const {
   IncrementKeychainAccessHistogram();
   return "mock_password";
 }
 
 }  // namespace crypto