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

Side by Side Diff: webrtc/base/thread.cc

Issue 1982733002: Re-enabling socket tests that were previously flaky. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing ifdefs. Using same logic as network.cc. Created 4 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
« no previous file with comments | « webrtc/base/testclient.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 // for each cycle. 495 // for each cycle.
496 ScopedAutoreleasePool pool; 496 ScopedAutoreleasePool pool;
497 #endif 497 #endif
498 { 498 {
499 Message msg; 499 Message msg;
500 if (!Get(&msg, cmsNext)) 500 if (!Get(&msg, cmsNext))
501 return !IsQuitting(); 501 return !IsQuitting();
502 Dispatch(&msg); 502 Dispatch(&msg);
503 503
504 if (cmsLoop != kForever) { 504 if (cmsLoop != kForever) {
505 cmsNext = TimeUntil(msEnd); 505 cmsNext = static_cast<int>(TimeUntil(msEnd));
506 if (cmsNext < 0) 506 if (cmsNext < 0)
507 return true; 507 return true;
508 } 508 }
509 } 509 }
510 } 510 }
511 } 511 }
512 512
513 bool Thread::WrapCurrentWithThreadManager(ThreadManager* thread_manager, 513 bool Thread::WrapCurrentWithThreadManager(ThreadManager* thread_manager,
514 bool need_synchronize_access) { 514 bool need_synchronize_access) {
515 if (running()) 515 if (running())
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 if (SUCCEEDED(hr)) { 556 if (SUCCEEDED(hr)) {
557 Thread::Run(); 557 Thread::Run();
558 CoUninitialize(); 558 CoUninitialize();
559 } else { 559 } else {
560 LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr; 560 LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr;
561 } 561 }
562 } 562 }
563 #endif 563 #endif
564 564
565 } // namespace rtc 565 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/testclient.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698