ScopedAllowWait for NativeBackendKWallet::InitWithBus

chrome/browser/password_manager/native_backend_kwallet_x.cc

 // Copyright (c) 2012 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/password_manager/native_backend_kwallet_x.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 using webkit::forms::PasswordForm;
@@ skipping 52 matching lines @@
   // succeeds, but later, we'll want to do most work on the DB thread. So we
   // have to do the initialization on the DB thread here too, and wait for it.
   bool success = false;
   base::WaitableEvent event(false, false);
   // NativeBackendKWallet isn't reference counted, but we wait for InitWithBus
   // to finish, so we can safely use base::Unretained here.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
                           base::Bind(&NativeBackendKWallet::InitOnDBThread,
                                      base::Unretained(this),
                                      optional_bus, &event, &success));
+
+  // This ScopedAllowWait should not be here. http://crbug.com/125331
+  base::ThreadRestrictions::ScopedAllowWait allow_wait;
   event.Wait();
   return success;
 }
 
 void NativeBackendKWallet::InitOnDBThread(scoped_refptr<dbus::Bus> optional_bus,
                                           base::WaitableEvent* event,
                                           bool* success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   DCHECK(!session_bus_.get());
   if (optional_bus.get()) {
@@ skipping 844 matching lines @@
     // Each other profile must be able to migrate the shared data as well,
     // so we must leave it alone. After a few releases, we'll add code to
     // delete them, and eventually remove this migration code.
     // TODO(mdm): follow through with the plan above.
     PasswordStoreX::SetPasswordsUseLocalProfileId(prefs_);
   } else {
     // We failed to migrate for some reason. Use the old folder name.
     folder_name_ = kKWalletFolder;
   }
 }