Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: mojo/edk/system/raw_channel_unittest.cc

Issue 1427633003: Move scoped_test_dir.* and test_io_thread.* from edk/test to edk/system/test. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/system/raw_channel_unittest.cc
diff --git a/mojo/edk/system/raw_channel_unittest.cc b/mojo/edk/system/raw_channel_unittest.cc
index 2a0916b7ae01fc4454565cbd090e38964a4c0c9f..1b5e7e2a3f1924fb78905d96568bed4a6ea648fd 100644
--- a/mojo/edk/system/raw_channel_unittest.cc
+++ b/mojo/edk/system/raw_channel_unittest.cc
@@ -20,11 +20,11 @@
#include "mojo/edk/system/message_in_transit.h"
#include "mojo/edk/system/mutex.h"
#include "mojo/edk/system/test/random.h"
+#include "mojo/edk/system/test/scoped_test_dir.h"
#include "mojo/edk/system/test/simple_test_thread.h"
#include "mojo/edk/system/test/sleep.h"
+#include "mojo/edk/system/test/test_io_thread.h"
#include "mojo/edk/system/transport_data.h"
-#include "mojo/edk/test/scoped_test_dir.h"
-#include "mojo/edk/test/test_io_thread.h"
#include "mojo/edk/test/test_utils.h"
#include "mojo/edk/util/make_unique.h"
#include "mojo/edk/util/scoped_file.h"
@@ -72,7 +72,7 @@ bool WriteTestMessageToHandle(const embedder::PlatformHandle& handle,
class RawChannelTest : public testing::Test {
public:
- RawChannelTest() : io_thread_(mojo::test::TestIOThread::StartMode::MANUAL) {}
+ RawChannelTest() : io_thread_(test::TestIOThread::StartMode::MANUAL) {}
~RawChannelTest() override {}
void SetUp() override {
@@ -89,12 +89,12 @@ class RawChannelTest : public testing::Test {
}
protected:
- mojo::test::TestIOThread* io_thread() { return &io_thread_; }
+ test::TestIOThread* io_thread() { return &io_thread_; }
embedder::ScopedPlatformHandle handles[2];
private:
- mojo::test::TestIOThread io_thread_;
+ test::TestIOThread io_thread_;
MOJO_DISALLOW_COPY_AND_ASSIGN(RawChannelTest);
};
@@ -779,7 +779,7 @@ class ReadPlatformHandlesCheckerRawChannelDelegate
};
TEST_F(RawChannelTest, ReadWritePlatformHandles) {
- mojo::test::ScopedTestDir test_dir;
+ test::ScopedTestDir test_dir;
WriteOnlyRawChannelDelegate write_delegate;
std::unique_ptr<RawChannel> rc_write(RawChannel::Create(handles[0].Pass()));
« no previous file with comments | « mojo/edk/system/platform_handle_dispatcher_unittest.cc ('k') | mojo/edk/system/remote_data_pipe_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698