[Autofill] Update tests to support native UI

chrome/browser/autofill/autofill_browsertest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
+#include "chrome/browser/autofill/autofill_external_delegate.h"
+#include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.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/autofill/validation.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"
@@ skipping 114 matching lines @@
   }
 
  private:
   bool alerted_;
   bool has_run_message_loop_;
   Browser* browser_;
   content::NotificationRegistrar registrar_;
   InfoBarService* infobar_service_;
 };
 
+class TestAutofillExternalDelegate : public AutofillExternalDelegate {
+ public:
+  TestAutofillExternalDelegate(content::WebContents* web_contents,
+                               AutofillManager* autofill_manager)
+      : AutofillExternalDelegate(web_contents, autofill_manager),
+        keyboard_listener_(NULL) {
+  }
+  virtual ~TestAutofillExternalDelegate() {}
+
+  virtual void OnPopupShown(content::KeyboardListener* listener) OVERRIDE {
+    AutofillExternalDelegate::OnPopupShown(listener);
+    keyboard_listener_ = listener;
+  }
+
+  virtual void OnPopupHidden(content::KeyboardListener* listener) OVERRIDE {
+    keyboard_listener_ = NULL;
+    AutofillExternalDelegate::OnPopupHidden(listener);
+  }
+
+  content::KeyboardListener* keyboard_listener() {
+    return keyboard_listener_;
+  }
+
+ private:
+  // The popup that is currently registered as a keyboard listener, or NULL if
+  // there is none.
+  content::KeyboardListener* keyboard_listener_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestAutofillExternalDelegate);
+};
+
 class AutofillTest : public InProcessBrowserTest {
  protected:
   AutofillTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     // Don't want Keychain coming up on Mac.
     autofill_test::DisableSystemServices(browser()->profile());
+
+    // When testing the native UI, hook up a test external delegate, which
+    // allows us to forward keyboard events to the popup directly.
+    content::WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    AutofillManager* autofill_manager =
+        AutofillManager::FromWebContents(web_contents);
+    if (autofill_manager->IsNativeUiEnabled()) {
+      external_delegate_.reset(
+          new TestAutofillExternalDelegate(web_contents, autofill_manager));
+      autofill_manager->SetExternalDelegate(external_delegate_.get());
+    }
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    // Make sure to close any showing popups prior to tearing down the UI.
+    content::WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    AutofillManager* autofill_manager =
+        AutofillManager::FromWebContents(web_contents);
+    autofill_manager->delegate()->HideAutofillPopup();
   }
 
   PersonalDataManager* personal_data_manager() {
     return PersonalDataManagerFactory::GetForProfile(browser()->profile());
   }
 
   void CreateTestProfile() {
     AutofillProfile profile;
     autofill_test::SetProfileInfo(
         &profile, "Milton", "C.", "Waddams",
@@ skipping 63 matching lines @@
     FillFormAndSubmit("autofill_creditcard_form.html", data);
   }
 
   // Populates a webpage form using autofill data and keypress events.
   // This function focuses the specified input field in the form, and then
   // sends keypress events to the tab to cause the form to be populated.
   void PopulateForm(const std::string& field_id) {
     std::string js("document.getElementById('" + field_id + "').focus();");
     ASSERT_TRUE(content::ExecuteScript(render_view_host(), js));
 
-    SendKeyAndWait(ui::VKEY_DOWN,
-                   chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
-    SendKeyAndWait(ui::VKEY_DOWN,
-                   chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
-    SendKeyAndWait(ui::VKEY_RETURN,
-                   chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
+    SendKeyToPageAndWait(ui::VKEY_DOWN,

[csharp, 2013/03/07 14:11:21]

Is this suppose to be different from the other 2?

[Ilya Sherman, 2013/03/07 22:32:16]

Yep, this is before the popup is showing.

+                         chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
+    SendKeyToPopupAndWait(ui::VKEY_DOWN,
+                          chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
+    SendKeyToPopupAndWait(ui::VKEY_RETURN,
+                          chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
   }
 
   // Aggregate profiles from forms into Autofill preferences. Returns the number
   // of parsed profiles.
   int AggregateProfilesIntoAutofillPrefs(const std::string& filename) {
     CHECK(test_server()->Start());
 
     std::string data;
     base::FilePath data_file =
         ui_test_utils::GetTestFilePath(base::FilePath().AppendASCII("autofill"),
@@ skipping 109 matching lines @@
     ExpectFieldValue("lastname", "Waddams");
     ExpectFieldValue("address1", "4120 Freidrich Lane");
     ExpectFieldValue("address2", "Basement");
     ExpectFieldValue("city", "Austin");
     ExpectFieldValue("state", "TX");
     ExpectFieldValue("zip", "78744");
     ExpectFieldValue("country", "US");
     ExpectFieldValue("phone", "5125551234");
   }
 
-  void SendKeyAndWait(ui::KeyboardCode key, int notification_type) {
+  void SendKeyToPageAndWait(ui::KeyboardCode key, int notification_type) {
     content::WindowedNotificationObserver observer(
         notification_type, content::Source<RenderViewHost>(render_view_host()));
     content::SimulateKeyPress(
         browser()->tab_strip_model()->GetActiveWebContents(),
         key, false, false, false, false);
     observer.Wait();
   }
 
+  void SendKeyToPopupAndWait(ui::KeyboardCode key, int notification_type) {
+    if (!external_delegate_) {

[csharp, 2013/03/07 14:11:21]

Add a comment to remove this once the WebKit code is removed

[Ilya Sherman, 2013/03/07 22:32:16]

Done.

+      // When testing the WebKit-based UI, route all keys to the page.
+      SendKeyToPageAndWait(key, notification_type);
+      return;
+    }
+
+    // When testing the native UI, route popup-targetted key presses via the

[csharp, 2013/03/07 14:11:21]

nit: targetted -> targeted

[Ilya Sherman, 2013/03/07 22:32:16]

Done.

+    // external delegate.
+    content::WindowedNotificationObserver observer(
+        notification_type, content::Source<RenderViewHost>(render_view_host()));
+    content::NativeWebKeyboardEvent event;
+    event.windowsKeyCode = key;
+    external_delegate_->keyboard_listener()->HandleKeyPressEvent(event);
+    observer.Wait();
+  }
+
   void TryBasicFormFill() {
     FocusFirstNameField();
 
     // Start filling the first name field with "M" and wait for the popup to be
     // shown.
     LOG(WARNING) << "Typing 'M' to bring up the Autofill popup.";
-    SendKeyAndWait(
+    SendKeyToPageAndWait(

[csharp, 2013/03/07 14:11:21]

Should these be SendKeyToPopupAndWait?

[Ilya Sherman, 2013/03/07 22:32:16]

No, there's no popup showing prior to this keypress.

         ui::VKEY_M, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
     // Press the down arrow to select the suggestion and preview the autofilled
     // form.
     LOG(WARNING) << "Simulating down arrow press to initiate Autofill preview.";
-    SendKeyAndWait(
+    SendKeyToPopupAndWait(
         ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
     // The previewed values should not be accessible to JavaScript.
     ExpectFieldValue("firstname", "M");
     ExpectFieldValue("lastname", "");
     ExpectFieldValue("address1", "");
     ExpectFieldValue("address2", "");
     ExpectFieldValue("city", "");
     ExpectFieldValue("state", "");
     ExpectFieldValue("zip", "");
     ExpectFieldValue("country", "");
     ExpectFieldValue("phone", "");
     // TODO(isherman): It would be nice to test that the previewed values are
     // displayed: http://crbug.com/57220
 
     // Press Enter to accept the autofill suggestions.
     LOG(WARNING) << "Simulating Return press to fill the form.";
-    SendKeyAndWait(
+    SendKeyToPopupAndWait(
         ui::VKEY_RETURN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
     // The form should be filled.
     ExpectFilledTestForm();
   }
 
+  TestAutofillExternalDelegate* external_delegate() {
+    return external_delegate_.get();
+  }
+
  private:
   net::TestURLFetcherFactory url_fetcher_factory_;
+  scoped_ptr<TestAutofillExternalDelegate> external_delegate_;
 };
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_BasicFormFill BasicFormFill
 #else
 #define MAYBE_BasicFormFill DISABLED_BasicFormFill
 #endif
 // Test that basic form fill is working.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_BasicFormFill) {
@@ skipping 19 matching lines @@
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Focus a fillable field.
   FocusFirstNameField();
 
   // Press the down arrow to initiate Autofill and wait for the popup to be
   // shown.
-  SendKeyAndWait(
+  SendKeyToPageAndWait(
       ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
-  SendKeyAndWait(
+  SendKeyToPopupAndWait(
       ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
   // Press Enter to accept the autofill suggestions.
-  SendKeyAndWait(
+  SendKeyToPopupAndWait(
       ui::VKEY_RETURN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_OnChangeAfterAutofill OnChangeAfterAutofill
 #else
@@ skipping 26 matching lines @@
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString + kOnChangeScript)));
 
   // Invoke Autofill.
   FocusFirstNameField();
 
   // Start filling the first name field with "M" and wait for the popup to be
   // shown.
-  SendKeyAndWait(
+  SendKeyToPageAndWait(
       ui::VKEY_M, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
-  SendKeyAndWait(
+  SendKeyToPopupAndWait(
       ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
   // Press Enter to accept the autofill suggestions.
-  SendKeyAndWait(
+  SendKeyToPopupAndWait(
       ui::VKEY_RETURN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
   // The form should be filled.
   ExpectFilledTestForm();
 
   // The change event should have already fired for unfocused fields, both of
   // <input> and of <select> type. However, it should not yet have fired for the
   // focused field.
   bool focused_fired = false;
   bool unfocused_fired = false;
@@ skipping 998 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DisableAutocompleteWhileFilling) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke Autofill: Start filling the first name field with "M" and wait for
   // the popup to be shown.
   FocusFirstNameField();
-  SendKeyAndWait(
+  SendKeyToPageAndWait(
       ui::VKEY_M, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
   // Now that the popup with suggestions is showing, disable autocomplete for
   // the active field.
   ASSERT_TRUE(content::ExecuteScript(
       render_view_host(),
       "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
   // autofilled form.
-  content::SimulateKeyPress(
-      browser()->tab_strip_model()->GetActiveWebContents(),
-      ui::VKEY_DOWN, false, false, false, false);
+  if (!external_delegate()) {

[csharp, 2013/03/07 14:11:21]

Is there a reason this can't use SendKeyToPopupAndWait?

[Ilya Sherman, 2013/03/07 22:32:16]

There's no event to wait for.

+    content::SimulateKeyPress(
+        browser()->tab_strip_model()->GetActiveWebContents(),
+        ui::VKEY_DOWN, false, false, false, false);
+  } else {
+    content::NativeWebKeyboardEvent event;
+    event.windowsKeyCode = ui::VKEY_DOWN;
+    external_delegate()->keyboard_listener()->HandleKeyPressEvent(event);
+  }
 
   // Wait for any IPCs to complete by performing an action that generates an
   // IPC that's easy to wait for.  Chrome shouldn't crash.
   bool result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
       "var city = document.getElementById('city');"
       "city.onfocus = function() { domAutomationController.send(true); };"
       "city.focus()",
       &result));
   ASSERT_TRUE(result);
-  SendKeyAndWait(
+  SendKeyToPageAndWait(
       ui::VKEY_A, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 }
 
 // Test that profiles merge for aggregated data with same address.
 // The criterion for when two profiles are expected to be merged is when their
 // 'Address Line 1' and 'City' data match. When two profiles are merged, any
 // remaining address fields are expected to be overwritten. Any non-address
 // fields should accumulate multi-valued data.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
@@ skipping 19 matching lines @@
 // TODO(isherman): this looks redundant, consider removing.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }