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

Side by Side Diff: mojo/embedder/embedder_unittest.cc

Issue 623883002: Revert "Move mojo edk into mojo/edk" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « mojo/embedder/embedder.cc ('k') | mojo/embedder/platform_channel_pair.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/edk/embedder/embedder.h" 5 #include "mojo/embedder/embedder.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/synchronization/waitable_event.h" 14 #include "base/synchronization/waitable_event.h"
15 #include "base/test/test_io_thread.h" 15 #include "base/test/test_io_thread.h"
16 #include "mojo/edk/embedder/platform_channel_pair.h" 16 #include "mojo/common/test/multiprocess_test_helper.h"
17 #include "mojo/edk/embedder/test_embedder.h" 17 #include "mojo/embedder/platform_channel_pair.h"
18 #include "mojo/edk/system/test_utils.h" 18 #include "mojo/embedder/test_embedder.h"
19 #include "mojo/edk/test/multiprocess_test_helper.h"
20 #include "mojo/public/c/system/core.h" 19 #include "mojo/public/c/system/core.h"
20 #include "mojo/system/test_utils.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 namespace mojo { 23 namespace mojo {
24 namespace embedder { 24 namespace embedder {
25 namespace { 25 namespace {
26 26
27 class ScopedTestChannel { 27 class ScopedTestChannel {
28 public: 28 public:
29 // Creates a channel that lives on a given I/O thread (determined by the given 29 // Creates a channel that lives on a given I/O thread (determined by the given
30 // |TaskRunner|) attached to the given |platform_handle|. After construction, 30 // |TaskRunner|) attached to the given |platform_handle|. After construction,
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 593
594 EXPECT_TRUE(test::Shutdown()); 594 EXPECT_TRUE(test::Shutdown());
595 } 595 }
596 596
597 // TODO(vtl): Test immediate write & close. 597 // TODO(vtl): Test immediate write & close.
598 // TODO(vtl): Test broken-connection cases. 598 // TODO(vtl): Test broken-connection cases.
599 599
600 } // namespace 600 } // namespace
601 } // namespace embedder 601 } // namespace embedder
602 } // namespace mojo 602 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/embedder/embedder.cc ('k') | mojo/embedder/platform_channel_pair.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698