[Autofill] Fix flakiness in autofill browsertest.

chrome/browser/autofill/autofill_browsertest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #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"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/translate_helper.h"
@@ skipping 32 matching lines @@
     "<label for=\"country\">Country:</label>"
     " <select id=\"country\">"
     " <option value=\"\" selected=\"yes\">--</option>"
     " <option value=\"CA\">Canada</option>"
     " <option value=\"US\">United States</option>"
     " </select><br>"
     "<label for=\"phone\">Phone number:</label>"
     " <input type=\"text\" id=\"phone\"><br>"
     "</form>";
 
+class WindowedPersonalDataManagerObserver : public PersonalDataManagerObserver {
+ public:
+  WindowedPersonalDataManagerObserver() :
+      personal_data_changed_(false),
+      has_run_message_loop_(false) {
+  }
+
+  void Wait() {
+    if (!personal_data_changed_) {
+      has_run_message_loop_ = true;
+      ui_test_utils::RunMessageLoop();
+    }
+  }
+
+  void OnPersonalDataChanged() OVERRIDE {
+    if (has_run_message_loop_) {
+      MessageLoopForUI::current()->Quit();
+      has_run_message_loop_ = false;
+    }
+
+    personal_data_changed_ = true;
+  }
+
+ private:
+  bool personal_data_changed_;
+  bool has_run_message_loop_;
+};
+
 class AutofillTest : public InProcessBrowserTest {
  protected:
   AutofillTest() {
     set_show_window(true);
     EnableDOMAutomation();
   }
 
   void CreateTestProfile() {
     autofill_test::DisableSystemServices(browser()->profile());
 
     AutofillProfile profile;
     autofill_test::SetProfileInfo(
         &profile, "Milton", "C.", "Waddams",
         "red.swingline@initech.com", "Initech", "4120 Freidrich Lane",
         "Basement", "Austin", "Texas", "78744", "United States", "5125551234");
 
     PersonalDataManager* personal_data_manager =
         PersonalDataManagerFactory::GetForProfile(browser()->profile());
     ASSERT_TRUE(personal_data_manager);
 
+    WindowedPersonalDataManagerObserver observer;
+    personal_data_manager->SetObserver(&observer);
+
     personal_data_manager->AddProfile(profile);
+
+    // AddProfile is asynchronous. Wait for it to finish before continuing the
+    // tests.
+    observer.Wait();
+    personal_data_manager->RemoveObserver(&observer);
   }
 
   void ExpectFieldValue(const std::wstring& field_name,
                         const std::string& expected_value) {
     std::string value;
     ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
         browser()->GetSelectedTabContents()->render_view_host(), L"",
         L"window.domAutomationController.send("
         L"document.getElementById('" + field_name + L"').value);", &value));
     EXPECT_EQ(expected_value, value);
@@ skipping 576 matching lines @@
   // Once click the text field, it starts again.
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
       render_view_host(), L"",
       L"cr.googleTranslate.onTranslateElementLoad();"));
 
   // Simulate the render notifying the translation has been done.
   translation_observer.Wait();
 
   TryBasicFormFill();
 }