Modify WaitableEvent::Wait() to return void

content/browser/in_process_webkit/indexed_db_key_utility_client.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 "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
 
 #include "base/lazy_instance.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/browser/utility_process_host.h"
 #include "content/common/indexed_db_key.h"
@@ skipping 179 matching lines @@
   DCHECK(state_ == STATE_UNINITIALIZED || state_ == STATE_SHUTDOWN);
   DCHECK(!utility_process_host_);
   DCHECK(!client_.get());
 }
 
 void KeyUtilityClientImpl::StartUtilityProcess() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   DCHECK(state_ == STATE_UNINITIALIZED);
 
   GetRDHAndStartUtilityProcess();
-  bool ret = waitable_event_.Wait();
+  waitable_event_.Wait();
 
-  DCHECK(ret && state_ == STATE_INITIALIZED);
+  DCHECK(state_ == STATE_INITIALIZED);
 }
 
 void KeyUtilityClientImpl::CreateIDBKeysFromSerializedValuesAndKeyPath(
     const std::vector<SerializedScriptValue>& values,
     const string16& key_path,
     std::vector<IndexedDBKey>* keys) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   if (state_ == STATE_SHUTDOWN) {
     keys->clear();
     return;
   }
 
   DCHECK(state_ == STATE_INITIALIZED);
 
   state_ = STATE_CREATING_KEYS;
   CallStartIDBKeyFromValueAndKeyPathFromIOThread(values, key_path);
-  bool ret = waitable_event_.Wait();
-  DCHECK(ret && state_ == STATE_INITIALIZED);
+  waitable_event_.Wait();
+  DCHECK(state_ == STATE_INITIALIZED);
 
   *keys = keys_;
 }
 
 SerializedScriptValue KeyUtilityClientImpl::InjectIDBKeyIntoSerializedValue(
     const IndexedDBKey& key,
     const SerializedScriptValue& value,
     const string16& key_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   if (state_ == STATE_SHUTDOWN)
     return SerializedScriptValue();
 
   DCHECK(state_ == STATE_INITIALIZED);
 
   state_ = STATE_INJECTING_KEY;
   CallStartInjectIDBKeyFromIOThread(key, value, key_path);
 
-  bool ret = waitable_event_.Wait();
-  DCHECK(ret && state_ == STATE_INITIALIZED);
+  waitable_event_.Wait();
+  DCHECK(state_ == STATE_INITIALIZED);
 
   return value_after_injection_;
 }
 
 
 void KeyUtilityClientImpl::GetRDHAndStartUtilityProcess() {
   // In order to start the UtilityProcess, we need to grab
   // a pointer to the ResourceDispatcherHost. This can only
   // be done on the UI thread. See the comment at the top of
   // browser_process.h
@@ skipping 141 matching lines @@
 void KeyUtilityClientImpl::Client::OnInjectIDBKeyFinished(
     const SerializedScriptValue& value) {
   parent_->SetValueAfterInjection(value);
   parent_->FinishInjectingKey();
 }
 
 void KeyUtilityClientImpl::Client::OnIDBKeysFromValuesAndKeyPathFailed(
     int id) {
   parent_->FinishCreatingKeys();
 }