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

Side by Side Diff: third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc

Issue 1157573002: Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stdint.h> 5 #include <stdint.h>
6 #include <stdio.h> 6 #include <stdio.h>
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 443
444 return 0; 444 return 0;
445 } 445 }
446 446
447 class MultiprocessMessagePipeTestWithPipeCount 447 class MultiprocessMessagePipeTestWithPipeCount
448 : public test::MultiprocessMessagePipeTestBase, 448 : public test::MultiprocessMessagePipeTestBase,
449 public testing::WithParamInterface<size_t> {}; 449 public testing::WithParamInterface<size_t> {};
450 450
451 #if defined(OS_MACOSX) 451 #if defined(OS_MACOSX)
452 // http://crbug.com/488260 452 // http://crbug.com/488260
453 TEST_P(MultiprocessMessagePipeTestWithPipeCount, 453 TEST_P(MultiprocessMessagePipeTestWithPipeCount, DISABLED_PlatformHandlePassing) {
454 DISABLED_PlatformHandlePassing) {
455 #else 454 #else
456 TEST_P(MultiprocessMessagePipeTestWithPipeCount, PlatformHandlePassing) { 455 TEST_P(MultiprocessMessagePipeTestWithPipeCount, PlatformHandlePassing) {
457 #endif 456 #endif
458 base::ScopedTempDir temp_dir; 457 base::ScopedTempDir temp_dir;
459 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); 458 ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
460 459
461 helper()->StartChild("CheckPlatformHandleFile"); 460 helper()->StartChild("CheckPlatformHandleFile");
462 461
463 scoped_refptr<ChannelEndpoint> ep; 462 scoped_refptr<ChannelEndpoint> ep;
464 scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep)); 463 scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep));
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 // Android multi-process tests are not executing the new process. This is flaky. 516 // Android multi-process tests are not executing the new process. This is flaky.
518 #if defined(OS_POSIX) && !defined(OS_ANDROID) 517 #if defined(OS_POSIX) && !defined(OS_ANDROID)
519 INSTANTIATE_TEST_CASE_P(PipeCount, 518 INSTANTIATE_TEST_CASE_P(PipeCount,
520 MultiprocessMessagePipeTestWithPipeCount, 519 MultiprocessMessagePipeTestWithPipeCount,
521 testing::Values(1u, 128u, 255u)); 520 testing::Values(1u, 128u, 255u));
522 #endif 521 #endif
523 522
524 } // namespace 523 } // namespace
525 } // namespace system 524 } // namespace system
526 } // namespace mojo 525 } // namespace mojo
OLDNEW
« no previous file with comments | « third_party/mojo/src/mojo/edk/system/master_connection_manager.cc ('k') | third_party/mojo/src/mojo/edk/system/raw_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698