Cope with a race condition in NetworkActionPredictor and NetworkActionPredictorDB initialization.

chrome/browser/autocomplete/network_action_predictor_database.cc

Index: chrome/browser/autocomplete/network_action_predictor_database.cc
diff --git a/chrome/browser/autocomplete/network_action_predictor_database.cc b/chrome/browser/autocomplete/network_action_predictor_database.cc
index 09b34fb9fa206b6e90b2160256bdddbdd15acf64..ba2a89b525ed56e1d17a56e2fc2b6ca7c266036b 100644
--- a/chrome/browser/autocomplete/network_action_predictor_database.cc
+++ b/chrome/browser/autocomplete/network_action_predictor_database.cc
@@ -89,7 +89,9 @@ NetworkActionPredictorDatabase::~NetworkActionPredictorDatabase() {
 
 void NetworkActionPredictorDatabase::Initialize() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
-  CHECK(!canceled_.IsSet());
+  if (canceled_.IsSet())

[Peter Kasting, 2011/11/14 22:49:13]

Nit: Looks like your practice elsewhere is to add a newline above this.

+    return;
+
   db_.set_exclusive_locking();
   if (!db_.Open(db_path_)) {
     canceled_.Set();