2 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/password_manager/password_form_manager_unittest.cc b/chrome/browser/password_manager/password_form_manager_unittest.cc
index d70e9d2..ebf4aa8 100644
--- a/chrome/browser/password_manager/password_form_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_form_manager_unittest.cc
@@ -500,6 +500,8 @@ TEST_F(PasswordFormManagerTest, TestValidFormsBasic) {
 }
 
 TEST_F(PasswordFormManagerTest, TestSendNotBlacklistedMessage) {
+  base::MessageLoop message_loop;
+
   // A dumb password manager.
   TestPasswordManagerDelegate delegate(profile());
   TestPasswordManager password_manager(&delegate);
@@ -537,6 +539,8 @@ TEST_F(PasswordFormManagerTest, TestSendNotBlacklistedMessage) {
 }
 
 TEST_F(PasswordFormManagerTest, TestForceInclusionOfGeneratedPasswords) {
+  base::MessageLoop message_loop;
+
   TestPasswordManagerDelegate delegate(profile());
   TestPasswordManager password_manager(&delegate);
   scoped_ptr<TestPasswordFormManager> manager(new TestPasswordFormManager(
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 0723bee..de39c7b 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -24,7 +24,6 @@
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/password_autofill_util.h"
 #include "components/user_prefs/pref_registry_syncable.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ -34,7 +33,6 @@
 using autofill::PasswordForm;
 using autofill::PasswordFormMap;
 using base::UserMetricsAction;
-using content::BrowserThread;
 using content::WebContents;
 
 namespace {
@@ -70,10 +68,10 @@ void ReportMetrics(bool password_manager_enabled) {
 
   // Avoid checking OS password until later on in browser startup
   // since it calls a few Windows APIs.
-  BrowserThread::PostDelayedTask(BrowserThread::UI,
-                                 FROM_HERE,
-                                 base::Bind(&ReportOsPassword),
-                                 base::TimeDelta::FromSeconds(10));
+  base::MessageLoopProxy::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&ReportOsPassword),
+      base::TimeDelta::FromSeconds(10));
 
   UMA_HISTOGRAM_BOOLEAN("PasswordManager.Enabled", password_manager_enabled);
 }