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

Unified Diff: content/browser/in_process_webkit/indexed_db_key_utility_client.cc

Issue 8221021: Modify WaitableEvent::Wait() to return void (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/in_process_webkit/indexed_db_key_utility_client.cc
diff --git a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
index 701b964d4bf667ae216d331fa27820616b3c91dd..9683385fcd019f2207906e54434ee6d5e29236c8 100644
--- a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
+++ b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
@@ -197,9 +197,9 @@ void KeyUtilityClientImpl::StartUtilityProcess() {
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(
@@ -216,8 +216,8 @@ void KeyUtilityClientImpl::CreateIDBKeysFromSerializedValuesAndKeyPath(
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_;
}
@@ -235,8 +235,8 @@ SerializedScriptValue KeyUtilityClientImpl::InjectIDBKeyIntoSerializedValue(
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_;
}

Powered by Google App Engine
This is Rietveld 408576698