summaryrefslogtreecommitdiffstats
path: root/mojo/common
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 00:53:27 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 00:53:27 +0000
commit5dddd197efdfc27a7f7701f2f9b5965aa68b771e (patch)
treec5ac6281af8bdad4f2460a139903ae533e804a85 /mojo/common
parentd232ef502b92b99c405fff9b0ecf9cccd2813398 (diff)
downloadchromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.zip
chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.tar.gz
chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.tar.bz2
Mojo: Move mojo/public/system/core_cpp.h to mojo/cpp/public/system/core.h.
Also begin rearranging tests. (I'm deferring moving macros_unittest.cc until after I split macros.h.) R=darin@chromium.org Review URL: https://codereview.chromium.org/214753004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/common')
-rw-r--r--mojo/common/handle_watcher.h2
-rw-r--r--mojo/common/handle_watcher_unittest.cc2
-rw-r--r--mojo/common/message_pump_mojo.h2
-rw-r--r--mojo/common/message_pump_mojo_handler.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/mojo/common/handle_watcher.h b/mojo/common/handle_watcher.h
index 115ac4a..aa151dc 100644
--- a/mojo/common/handle_watcher.h
+++ b/mojo/common/handle_watcher.h
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "mojo/common/mojo_common_export.h"
-#include "mojo/public/system/core_cpp.h"
+#include "mojo/public/cpp/system/core.h"
namespace base {
class Thread;
diff --git a/mojo/common/handle_watcher_unittest.cc b/mojo/common/handle_watcher_unittest.cc
index 4fc03b1..3eace0c 100644
--- a/mojo/common/handle_watcher_unittest.cc
+++ b/mojo/common/handle_watcher_unittest.cc
@@ -11,7 +11,7 @@
#include "base/run_loop.h"
#include "base/test/simple_test_tick_clock.h"
#include "mojo/common/time_helper.h"
-#include "mojo/public/system/core_cpp.h"
+#include "mojo/public/cpp/system/core.h"
#include "mojo/public/tests/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/common/message_pump_mojo.h b/mojo/common/message_pump_mojo.h
index b5b6443..cc21565 100644
--- a/mojo/common/message_pump_mojo.h
+++ b/mojo/common/message_pump_mojo.h
@@ -11,7 +11,7 @@
#include "base/message_loop/message_pump.h"
#include "base/time/time.h"
#include "mojo/common/mojo_common_export.h"
-#include "mojo/public/system/core_cpp.h"
+#include "mojo/public/cpp/system/core.h"
namespace mojo {
namespace common {
diff --git a/mojo/common/message_pump_mojo_handler.h b/mojo/common/message_pump_mojo_handler.h
index e8c6a86..5809051 100644
--- a/mojo/common/message_pump_mojo_handler.h
+++ b/mojo/common/message_pump_mojo_handler.h
@@ -6,7 +6,7 @@
#define MOJO_COMMON_MESSAGE_PUMP_MOJO_HANDLER_H_
#include "mojo/common/mojo_common_export.h"
-#include "mojo/public/system/core_cpp.h"
+#include "mojo/public/cpp/system/core.h"
namespace mojo {
namespace common {