summaryrefslogtreecommitdiffstats
path: root/base/test
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 20:27:52 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 20:27:52 +0000
commit59e69e745ba3fa290ff3c50e65c3db03ee9dde6b (patch)
tree64b82fd1e2375845b59f278f2a1e892dcf54377b /base/test
parentbd41e70e44d19eb809eb8565b1d8479daef5d8f5 (diff)
downloadchromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.zip
chromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.tar.gz
chromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.tar.bz2
Move message_pump to base/message_loop.
This also fixes some namespace usage inside the message pump files and updates all users of these files to use the new location. Reland of 206507. Original review https://codereview.chromium.org/17078005/ TBR=sky Review URL: https://codereview.chromium.org/16897006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
-rw-r--r--base/test/mock_chrome_application_mac.h2
-rw-r--r--base/test/test_support_android.cc4
-rw-r--r--base/test/test_support_ios.mm4
3 files changed, 5 insertions, 5 deletions
diff --git a/base/test/mock_chrome_application_mac.h b/base/test/mock_chrome_application_mac.h
index 5cd1d19..ffa3080 100644
--- a/base/test/mock_chrome_application_mac.h
+++ b/base/test/mock_chrome_application_mac.h
@@ -10,7 +10,7 @@
#import <AppKit/AppKit.h>
#include "base/mac/scoped_sending_event.h"
-#include "base/message_pump_mac.h"
+#include "base/message_loop/message_pump_mac.h"
// A basic implementation of CrAppProtocol and
// CrAppControlProtocol. This can be used in tests that need an
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index 64da18a..5180333 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -9,8 +9,8 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/singleton.h"
-#include "base/message_loop.h"
-#include "base/message_pump_android.h"
+#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_pump_android.h"
#include "base/path_service.h"
#include "base/synchronization/waitable_event.h"
diff --git a/base/test/test_support_ios.mm b/base/test/test_support_ios.mm
index cb07f00..ebe6767 100644
--- a/base/test/test_support_ios.mm
+++ b/base/test/test_support_ios.mm
@@ -8,8 +8,8 @@
#include "base/logging.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/memory/scoped_nsobject.h"
-#include "base/message_loop.h"
-#include "base/message_pump_default.h"
+#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_pump_default.h"
#include "base/test/test_suite.h"
// Springboard will kill any iOS app that fails to check in after launch within