[Autofill] Fix flakiness in autofill browsertest.

chrome/browser/autofill/autofill_browsertest.cc

Index: chrome/browser/autofill/autofill_browsertest.cc
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index f25b3645e97061083a95e23876c313db971f675f..4a57b517c9f13714afd89fd8c794e2ea468b9998 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/autofill/personal_data_manager_observer.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
@@ -65,6 +66,17 @@ static const char* kTestFormString =
     " <input type=\"text\" id=\"phone\"><br>"
     "</form>";
 
+class TestPersonalDataManagerObserver : public PersonalDataManagerObserver {

[Ilya Sherman, 2011/12/13 00:02:56]

nit: Perhaps name this "WindowedPersonalDataManagerObserver", to match
"WindowedNotificationObserver" in ui_test_utils.h?

[binji, 2011/12/13 01:54:25]

Done.

+ public:
+  void Wait() {
+    ui_test_utils::RunMessageLoop();
+  }
+
+  void OnPersonalDataChanged() OVERRIDE {
+    MessageLoopForUI::current()->Quit();
+  }
+};

[Ilya Sherman, 2011/12/13 00:02:56]

I think this class needs to track whether OnPersonalDataChanged() has already
been called by the time Wait() is called -- otherwise, the call to
RunMessageLoop() in Wait() might never be balanced with a Quit()

[binji, 2011/12/13 01:54:25]

Done.

+
 class AutofillTest : public InProcessBrowserTest {
  protected:
   AutofillTest() {
@@ -85,7 +97,13 @@ class AutofillTest : public InProcessBrowserTest {
         PersonalDataManagerFactory::GetForProfile(browser()->profile());
     ASSERT_TRUE(personal_data_manager);
 
+    TestPersonalDataManagerObserver observer;
+    personal_data_manager->SetObserver(&observer);
+
     personal_data_manager->AddProfile(profile);
+
+    observer.Wait();

[Ilya Sherman, 2011/12/13 00:02:56]

nit: Please add a comment describing what this is waiting for.

[binji, 2011/12/13 01:54:25]

Done.

+    personal_data_manager->RemoveObserver(&observer);
   }
 
   void ExpectFieldValue(const std::wstring& field_name,