Modify WaitableEvent::Wait() to return void

chrome/browser/sync/glue/http_bridge.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/http_bridge.h"
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/browser_thread.h"
@@ skipping 180 matching lines @@
   DCHECK(!content_type_.empty()) << "Payload not set";
 
   if (!BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           NewRunnableMethod(this, &HttpBridge::CallMakeAsynchronousPost))) {
     // This usually happens when we're in a unit test.
     LOG(WARNING) << "Could not post CallMakeAsynchronousPost task";
     return false;
   }
 
-  if (!http_post_completed_.Wait())  // Block until network request completes
-    NOTREACHED();                    // or is aborted. See OnURLFetchComplete
-                                     // and Abort.
+  // Block until network request completes or is aborted. See
+  // OnURLFetchComplete and Abort.
+  http_post_completed_.Wait();
 
   base::AutoLock lock(fetch_state_lock_);
   DCHECK(fetch_state_.request_completed || fetch_state_.aborted);
   *error_code = fetch_state_.error_code;
   *response_code = fetch_state_.http_response_code;
   return fetch_state_.request_succeeded;
 }
 
 void HttpBridge::MakeAsynchronousPost() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 76 matching lines @@
   // URLFetcher, so it seems most natural / "polite" to let the stack unwind.
   MessageLoop::current()->DeleteSoon(FROM_HERE, fetch_state_.url_poster);
   fetch_state_.url_poster = NULL;
 
   // Wake the blocked syncer thread in MakeSynchronousPost.
   // WARNING: DONT DO ANYTHING AFTER THIS CALL! |this| may be deleted!
   http_post_completed_.Signal();
 }
 
 }  // namespace browser_sync