Fix list focus after tab key in chrome://settings/autofillEditAddress page.

chrome/browser/autofill/autofill_uitest_util.cc

Index: chrome/browser/autofill/autofill_uitest_util.cc
diff --git a/chrome/browser/autofill/autofill_uitest_util.cc b/chrome/browser/autofill/autofill_uitest_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1b7831b3bd1f182e2d0b6b6fb58fc49697c4203e
--- /dev/null
+++ b/chrome/browser/autofill/autofill_uitest_util.cc
@@ -0,0 +1,104 @@
+// Copyright 2015 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/autofill/autofill_uitest_util.h"
+#include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
+#include "components/infobars/core/infobar.h"
+#include "components/infobars/core/infobar_manager.h"
+#include "content/public/test/test_utils.h"
+
+namespace autofill {
+
+// This class is used to wait for asynchronous updates to PersonalDataManager

[Evan Stade, 2015/01/30 19:16:33]

still don't know what Windowed means here

[bondd, 2015/01/30 20:24:17]

I think we should just rename it. Requesting suggestions.
InfoBarPersonalDataManagerObserver? MyPersonalDataManagerObserver? WaitObserver?
AsyncWaitObserver?

I'm not sure what "Windowed" means here either. There are a bunch of copies of
this code floating around in different tests. I don't know which is the original
or who named it first, I 'git blame'd it back to at least 2012.

+// to complete.
+class WindowedPersonalDataManagerObserver
+    : public PersonalDataManagerObserver,
+      public infobars::InfoBarManager::Observer {
+ public:
+  explicit WindowedPersonalDataManagerObserver(Browser* browser)
+      : alerted_(false),
+        has_run_message_loop_(false),
+        browser_(browser),
+        infobar_service_(InfoBarService::FromWebContents(
+            browser_->tab_strip_model()->GetActiveWebContents())) {
+    PersonalDataManagerFactory::GetForProfile(browser_->profile())->
+        AddObserver(this);
+    infobar_service_->AddObserver(this);
+  }
+
+  ~WindowedPersonalDataManagerObserver() override {
+    while (infobar_service_->infobar_count() > 0) {
+      infobar_service_->RemoveInfoBar(infobar_service_->infobar_at(0));
+    }
+    infobar_service_->RemoveObserver(this);
+  }
+
+  // PersonalDataManagerObserver:
+  void OnPersonalDataChanged() override {
+    if (has_run_message_loop_) {
+      base::MessageLoopForUI::current()->Quit();
+      has_run_message_loop_ = false;
+    }
+    alerted_ = true;
+  }
+
+  void OnInsufficientFormData() override { OnPersonalDataChanged(); }
+
+
+  void Wait() {
+    if (!alerted_) {
+      has_run_message_loop_ = true;
+      content::RunMessageLoop();
+    }
+    PersonalDataManagerFactory::GetForProfile(browser_->profile())->
+        RemoveObserver(this);
+  }
+
+ private:
+  // infobars::InfoBarManager::Observer:
+  void OnInfoBarAdded(infobars::InfoBar* infobar) override {
+    infobar_service_->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate()->
+        Accept();
+  }
+
+  bool alerted_;
+  bool has_run_message_loop_;
+  Browser* browser_;
+  InfoBarService* infobar_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(WindowedPersonalDataManagerObserver);
+};
+
+static PersonalDataManager* GetPersonalDataManager(Profile* profile) {
+  return PersonalDataManagerFactory::GetForProfile(profile);
+}
+
+void AddTestProfile(Browser* browser, const AutofillProfile& profile) {
+    WindowedPersonalDataManagerObserver observer(browser);

[Evan Stade, 2015/01/30 19:16:33]

too much indent

[bondd, 2015/01/30 22:10:00]

Done.

+    GetPersonalDataManager(browser->profile())->AddProfile(profile);
+
+    // AddProfile is asynchronous. Wait for it to finish before continuing the
+    // tests.
+    observer.Wait();
+}
+
+void SetTestProfile(Browser* browser, const AutofillProfile& profile) {
+  std::vector<AutofillProfile> profiles;
+  profiles.push_back(profile);
+  SetTestProfiles(browser, &profiles);
+}
+
+void SetTestProfiles(Browser* browser, std::vector<AutofillProfile>* profiles) {
+  WindowedPersonalDataManagerObserver observer(browser);
+  GetPersonalDataManager(browser->profile())->SetProfiles(profiles);
+  observer.Wait();
+}
+
+}  // namespace autofill