Merge from Chromium at DEPS revision r213057
This commit was generated by merge_to_master.py.
Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
diff --git a/base/win/metro.cc b/base/win/metro.cc
index acf530f..afe4fce 100644
--- a/base/win/metro.cc
+++ b/base/win/metro.cc
@@ -4,7 +4,7 @@
#include "base/win/metro.h"
-#include "base/message_loop.h"
+#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
#include "base/win/scoped_comptr.h"
#include "base/win/windows_version.h"
diff --git a/base/win/object_watcher.h b/base/win/object_watcher.h
index 742f2b0..4222c20 100644
--- a/base/win/object_watcher.h
+++ b/base/win/object_watcher.h
@@ -10,7 +10,7 @@
#include "base/base_export.h"
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop.h"
+#include "base/message_loop/message_loop.h"
namespace base {
namespace win {
diff --git a/base/win/object_watcher_unittest.cc b/base/win/object_watcher_unittest.cc
index df66646..46b98de 100644
--- a/base/win/object_watcher_unittest.cc
+++ b/base/win/object_watcher_unittest.cc
@@ -6,7 +6,7 @@
#include <process.h>
-#include "base/message_loop.h"
+#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/win/wrapped_window_proc_unittest.cc b/base/win/wrapped_window_proc_unittest.cc
index ccf3c85..161c913 100644
--- a/base/win/wrapped_window_proc_unittest.cc
+++ b/base/win/wrapped_window_proc_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/message_loop/message_loop.h"
#include "base/win/wrapped_window_proc.h"
-#include "base/message_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {