Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 5 insertions, 4 deletions

diff --git a/base/message_loop.cc b/base/message_loop.cc
index fbac9f8..2a92f4f 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -7,10 +7,10 @@
 #include <algorithm>
 
 #include "base/compiler_specific.h"
-#include "base/histogram.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_pump_default.h"
+#include "base/metrics/histogram.h"
 #include "base/thread_local.h"
 
 #if defined(OS_MACOSX)
@@ -60,7 +60,7 @@ const int kNumberOfDistinctMessagesDisplayed = 1100;
 // in the pair (i.e., the quoted string) when printing out a histogram.
 #define VALUE_TO_NUMBER_AND_NAME(name) {name, #name},
 
-const LinearHistogram::DescriptionPair event_descriptions_[] = {
+const base::LinearHistogram::DescriptionPair event_descriptions_[] = {
   // Provide some pretty print capability in our histogram for our internal
   // messages.
 
@@ -622,9 +622,10 @@ void MessageLoop::EnableHistogrammer(bool enable) {
 
 void MessageLoop::StartHistogrammer() {
   if (enable_histogrammer_ && !message_histogram_.get()
-      && StatisticsRecorder::WasStarted()) {
+      && base::StatisticsRecorder::WasStarted()) {
     DCHECK(!thread_name_.empty());
-    message_histogram_ = LinearHistogram::FactoryGet("MsgLoop:" + thread_name_,
+    message_histogram_ = base::LinearHistogram::FactoryGet(
+        "MsgLoop:" + thread_name_,
         kLeastNonZeroMessageId, kMaxMessageId,
         kNumberOfDistinctMessagesDisplayed,
         message_histogram_->kHexRangePrintingFlag);