Change includes of histogram.h to histogram_macros.h.

This is another pass of migration of includes for users of histogram
macros. This doesn't fully complete the migration, but gets us closer
to the end result.

A few files needed to include both headers as they use both
macros and the raw API.

BUG=416479
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
[email protected]

Review-Url: https://codereview.chromium.org/2293583002
Cr-Commit-Position: refs/heads/master@{#415067}
diff --git a/components/omnibox/browser/zero_suggest_provider.cc b/components/omnibox/browser/zero_suggest_provider.cc
index 32994b5d..f848a3c8 100644
--- a/components/omnibox/browser/zero_suggest_provider.cc
+++ b/components/omnibox/browser/zero_suggest_provider.cc
@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/i18n/case_conversion.h"
 #include "base/json/json_string_value_serializer.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"