Modify WaitableEvent::Wait() to return void

webkit/tools/test_shell/simple_resource_loader_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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using net::URLRequest, meaning it is a "simple"
 // version that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because net::URLRequest only provides an asynchronous resource loading API,
@@ skipping 670 matching lines @@
 
 //-----------------------------------------------------------------------------
 
 class SyncRequestProxy : public RequestProxy {
  public:
   explicit SyncRequestProxy(ResourceLoaderBridge::SyncLoadResponse* result)
       : result_(result), event_(true, false) {
   }
 
   void WaitForCompletion() {
-    if (!event_.Wait())
-      NOTREACHED();
+    event_.Wait();
   }
 
   // --------------------------------------------------------------------------
   // Event hooks that run on the IO thread:
 
   virtual void OnReceivedRedirect(
       const GURL& new_url,
       const ResourceResponseInfo& info,
       bool* defer_redirect) {
     // TODO(darin): It would be much better if this could live in WebCore, but
@@ skipping 169 matching lines @@
   CookieGetter() : event_(false, false) {
   }
 
   void Get(const GURL& url) {
     g_request_context->cookie_store()->GetCookiesWithOptionsAsync(
         url, net::CookieOptions(),
         base::Bind(&CookieGetter::OnGetCookies, this));
   }
 
   std::string GetResult() {
-    if (!event_.Wait())
-      NOTREACHED();
+    event_.Wait();
     return result_;
   }
 
  private:
   void OnGetCookies(const std::string& cookie_line) {
     result_ = cookie_line;
     event_.Signal();
   }
   friend class base::RefCountedThreadSafe<CookieGetter>;
 
@@ skipping 138 matching lines @@
 
 // static
 void SimpleResourceLoaderBridge::AllowFileOverHTTP(
     const std::string& file_path_template, const GURL& http_prefix) {
   DCHECK(!file_path_template.empty());
   DCHECK(http_prefix.is_valid() &&
          (http_prefix.SchemeIs("http") || http_prefix.SchemeIs("https")));
   g_file_over_http_params = new FileOverHTTPParams(file_path_template,
                                                    http_prefix);
 }