Merge ~osomon/oxide:autofill into oxide:master

[Olivier Tilloy]

Add support for autofill popups in UbuntuWebView (LP: #1214048).

This initial implementation supports single text fields, datalist entries and autofill profiles.
Credit cards and passwords are not supported.
There is no API to manage stored profiles, this will be implemented as a followup feature.

8f3dace... by Olivier Tilloy on 2017-02-28

Fix a unit test when run in single process mode.

acc726e... by Olivier Tilloy on 2017-03-10

Reduce the height of the autofill entries.

2bf8c7c... by Olivier Tilloy on 2017-03-10

Preview autofill entry under mouse cursor.

fca284a... by Olivier Tilloy on 2017-03-10

Highlight currently selected suggestion.

32f4f1e... by Olivier Tilloy on 2017-03-13

Simplify focus handling.

0fd49b9... by Olivier Tilloy on 2017-03-13

Fix FTBFS.

305a4b1... by Olivier Tilloy on 2017-03-13

Handle validation when no suggestion is selected.

c6f3be8... by Olivier Tilloy on 2017-03-14

Add a unit test for autofill popup destruction.

ff81c57... by Olivier Tilloy on 2017-03-15

Ensure unit tests are locale-independent.

[Chris Coulson (chrisccoulson)]

I haven't had time to complete the review of this yet, so I've left you a few comments in the meantime to unblock you :)

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

I've left a few more comments now. I've not yet finished reviewing it though, so there will most likely be some more later.

review: Needs Fixing

f7170cf... by Olivier Tilloy on 2017-03-23

Fix build errors when rebased on latest master.

12ec53f... by Olivier Tilloy on 2017-03-23

Always use an InMemoryPrefStore.

Persisting the value of OxideQQuickWebContext::autofillEnabled would be
inconsistent with every other setting exposed by the API
(eg, we don't persist popupBlockerEnabled or doNotTrackEnabled).

2c47ca7... by Olivier Tilloy on 2017-03-23

Move CreateAutofillPopup to WebContentsClient.

bd0082a... by Olivier Tilloy on 2017-03-23

Bump version for new WebContext API to 1.23.

b7f468f... by Olivier Tilloy on 2017-03-23

Drop default case as there's already a branch for every value.

579a028... by Olivier Tilloy on 2017-03-23

Do not modify oxide::ContentClient to access the application locale.

Instead, expose the application locale as a new method on BrowserPlatformIntegration.

e1aa089... by Olivier Tilloy on 2017-03-23

Marked a private helper private.

f0aa5a2... by Olivier Tilloy on 2017-03-23

Ensure that autofill works in incognito mode, as expected.

[Olivier Tilloy (osomon)]

I addressed the first round of comments from two days ago. Still pending: add tests for autofill behaviour in incognito mode.

1d7be1b... by Olivier Tilloy on 2017-03-23

Add tests for autofill in incognito webviews.

e48baae... by Olivier Tilloy on 2017-03-23

Make WebAutofillPopupHost::Init not return anything, for consistency.

4017f9d... by Olivier Tilloy on 2017-03-23

Remove redundant std::move().

4116cd7... by Olivier Tilloy on 2017-03-23

Rename methods to start with an uppercase letter, for consistency with newly-written code.

31d4425... by Olivier Tilloy on 2017-03-23

Take timeout into account.

dc3f850... by Olivier Tilloy on 2017-03-23

Do not depend on the omnibox component in release builds.

f4c8cba... by Olivier Tilloy on 2017-03-23

Rename files for consistency with newly-added code.

4fd1d34... by Olivier Tilloy on 2017-03-23

Remove unused references to gfx::NativeView (always null) in AutofillPopupController.

88dfc51... by Olivier Tilloy on 2017-03-23

Remove unused method.

31c9a11... by Olivier Tilloy on 2017-03-23

Make ownership of AutofillPopupController explicit.

[Olivier Tilloy (osomon)]

I addressed all comments (and answered questions) in the second review round except for the last one (the suggestion to re-implement a custom WebDataServiceWrapper), which is pending.

8dcafd5... by Olivier Tilloy on 2017-03-27

Fork WebDataServiceWrapper to remove bits that oxide doesn't need.

[Olivier Tilloy (osomon)]

WebDataServiceWrapper has been forked to remove all the bits that oxide doesn't need, thus removing the need for the dependency on omnibox in a component build.

bc34ffb... by Olivier Tilloy on 2017-03-27

New FilteredPrefStore class that stores all preferences in memory except for a selected set which are persisted on disk.

133ba6a... by Olivier Tilloy on 2017-03-28

Unit tests for FilteredPrefStore.

1ac8924... by Olivier Tilloy on 2017-04-17

Remove stale line that remained after rebasing on master.

Unmerged commits

1ac8924... by Olivier Tilloy on 2017-04-17

Remove stale line that remained after rebasing on master.

133ba6a... by Olivier Tilloy on 2017-03-28

Unit tests for FilteredPrefStore.

bc34ffb... by Olivier Tilloy on 2017-03-27

New FilteredPrefStore class that stores all preferences in memory except for a selected set which are persisted on disk.

8dcafd5... by Olivier Tilloy on 2017-03-27

Fork WebDataServiceWrapper to remove bits that oxide doesn't need.

31c9a11... by Olivier Tilloy on 2017-03-23

Make ownership of AutofillPopupController explicit.

88dfc51... by Olivier Tilloy on 2017-03-23

Remove unused method.

4fd1d34... by Olivier Tilloy on 2017-03-23

Remove unused references to gfx::NativeView (always null) in AutofillPopupController.

f4c8cba... by Olivier Tilloy on 2017-03-23

Rename files for consistency with newly-added code.

dc3f850... by Olivier Tilloy on 2017-03-23

Do not depend on the omnibox component in release builds.

31d4425... by Olivier Tilloy on 2017-03-23

Take timeout into account.

diff --git a/qt/core/BUILD.gn b/qt/core/BUILD.gn
index 4a12427..6dd0eb2 100644
--- a/qt/core/BUILD.gn
+++ b/qt/core/BUILD.gn
@@ -92,6 +92,7 @@ source_set("core_sources") {
     ":core_moc_gen",
     ":oxide_version",
     "//base",
+    "//components/autofill/core/browser",
     "//components/sessions",
     "//content/public/browser",
     "//content/public/common",
@@ -269,6 +270,8 @@ source_set("core_sources") {
     "browser/touch_selection/touch_editing_menu_host.h",
     "browser/touch_selection/touch_handle_drawable_host.cc",
     "browser/touch_selection/touch_handle_drawable_host.h",
+    "browser/web_autofill_popup_host.cc",
+    "browser/web_autofill_popup_host.h",
     "browser/web_contents_id_tracker.cc",
     "browser/web_contents_id_tracker.h",
     "browser/web_context_menu_host.cc",
@@ -278,6 +281,8 @@ source_set("core_sources") {
     "browser/web_preferences.cc",
     "browser/web_preferences.h",
     "common/oxide_qt_export.h",
+    "glue/autofill_suggestion.cc",
+    "glue/autofill_suggestion.h",
     "glue/chrome_controller.cc",
     "glue/chrome_controller.h",
     "glue/chrome_controller_client.h",
@@ -325,6 +330,8 @@ source_set("core_sources") {
     "glue/screen_utils.h",
     "glue/touch_editing_menu.h",
     "glue/touch_editing_menu_client.h",
+    "glue/web_autofill_popup.h",
+    "glue/web_autofill_popup_client.h",
     "glue/web_context_menu.h",
     "glue/web_context_menu_actions.h",
     "glue/web_context_menu_client.h",
diff --git a/qt/core/browser/contents_view_impl.cc b/qt/core/browser/contents_view_impl.cc
index e683c42..b648fc6 100644
--- a/qt/core/browser/contents_view_impl.cc
+++ b/qt/core/browser/contents_view_impl.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2016 Canonical Ltd.
+// Copyright (C) 2016-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/qt/core/browser/oxide_qt_browser_platform_integration.cc b/qt/core/browser/oxide_qt_browser_platform_integration.cc
index 8c6455e..ee2226c 100644
--- a/qt/core/browser/oxide_qt_browser_platform_integration.cc
+++ b/qt/core/browser/oxide_qt_browser_platform_integration.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014-2016 Canonical Ltd.
+// Copyright (C) 2014-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,7 @@
 #include <QDesktopServices>
 #include <QEvent>
 #include <QGuiApplication>
+#include <QLocale>
 #include <QStyleHints>
 #include <QPointer>
 #include <QString>
@@ -183,6 +184,10 @@ std::string BrowserPlatformIntegration::GetApplicationName() {
   return application_name_;
 }
 
+std::string BrowserPlatformIntegration::GetApplicationLocale() {
+  return QLocale::system().name().toStdString();
+}
+
 std::unique_ptr<oxide::DragSource> BrowserPlatformIntegration::CreateDragSource(
     oxide::DragSourceClient* client) {
   return base::WrapUnique(new DragSource(client));
diff --git a/qt/core/browser/oxide_qt_browser_platform_integration.h b/qt/core/browser/oxide_qt_browser_platform_integration.h
index 0f7eeb1..f676a1d 100644
--- a/qt/core/browser/oxide_qt_browser_platform_integration.h
+++ b/qt/core/browser/oxide_qt_browser_platform_integration.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014-2015 Canonical Ltd.
+// Copyright (C) 2014-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,6 +63,7 @@ class BrowserPlatformIntegration : public QObject,
   ApplicationState GetApplicationState() override;
   virtual int GetClickInterval() override;
   std::string GetApplicationName() override;
+  std::string GetApplicationLocale() override;
   std::unique_ptr<oxide::DragSource> CreateDragSource(
       oxide::DragSourceClient* client) override;
   void CreateVibrationManager(
diff --git a/qt/core/browser/oxide_qt_web_context.cc b/qt/core/browser/oxide_qt_web_context.cc
index 504d165..fc1492f 100644
--- a/qt/core/browser/oxide_qt_web_context.cc
+++ b/qt/core/browser/oxide_qt_web_context.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -138,7 +138,8 @@ struct WebContext::ConstructProperties {
         devtools_enabled(false),
         devtools_port(-1),
         legacy_user_agent_override_enabled(false),
-        do_not_track(false) {}
+        do_not_track(false),
+        autofill_enabled(false) {}
 
   std::string product;
   std::string user_agent;
@@ -158,6 +159,7 @@ struct WebContext::ConstructProperties {
   std::vector<UserAgentSettings::UserAgentOverride> user_agent_overrides;
   bool legacy_user_agent_override_enabled;
   bool do_not_track;
+  bool autofill_enabled;
 };
 
 class SetCookiesContext : public base::RefCounted<SetCookiesContext> {
@@ -499,6 +501,7 @@ BrowserContext* WebContext::GetContext() {
   ua_settings->SetIsPopupBlockerEnabled(
       construct_props_->popup_blocker_enabled);
   ua_settings->SetDoNotTrack(construct_props_->do_not_track);
+  ua_settings->SetAutofillEnabled(construct_props_->autofill_enabled);
 
   context_->SetCookiePolicy(construct_props_->cookie_policy);
 
@@ -999,7 +1002,7 @@ void WebContext::DefaultVideoDeviceChanged() {
 }
 
 bool WebContext::doNotTrack() const {
-    if (IsInitialized()) {
+  if (IsInitialized()) {
     return UserAgentSettings::Get(context_.get())->GetDoNotTrack();
   }
 
@@ -1014,5 +1017,21 @@ void WebContext::setDoNotTrack(bool dnt) {
   }
 }
 
+bool WebContext::autofillEnabled() const {
+  if (IsInitialized()) {
+    return UserAgentSettings::Get(context_.get())->IsAutofillEnabled();
+  }
+
+  return construct_props_->autofill_enabled;
+}
+
+void WebContext::setAutofillEnabled(bool enabled) {
+  if (IsInitialized()) {
+    UserAgentSettings::Get(context_.get())->SetAutofillEnabled(enabled);
+  } else {
+    construct_props_->autofill_enabled = enabled;
+  }
+}
+
 } // namespace qt
 } // namespace oxide
diff --git a/qt/core/browser/oxide_qt_web_context.h b/qt/core/browser/oxide_qt_web_context.h
index 1425b38..1dd4134 100644
--- a/qt/core/browser/oxide_qt_web_context.h
+++ b/qt/core/browser/oxide_qt_web_context.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -144,6 +144,9 @@ class WebContext : public WebContextProxy,
   bool doNotTrack() const override;
   void setDoNotTrack(bool dnt) override;
 
+  bool autofillEnabled() const override;
+  void setAutofillEnabled(bool enabled) override;
+
   // oxide::MediaCaptureDevicesContextClient implementation
   void DefaultAudioDeviceChanged() override;
   void DefaultVideoDeviceChanged() override;
diff --git a/qt/core/browser/oxide_qt_web_view.cc b/qt/core/browser/oxide_qt_web_view.cc
index ab4d2d2..dd97d3d 100644
--- a/qt/core/browser/oxide_qt_web_view.cc
+++ b/qt/core/browser/oxide_qt_web_view.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,7 @@
 
 #include <QGuiApplication>
 #include <QInputEvent>
+#include <QRectF>
 #include <QScreen>
 #include <QString>
 #include <QtDebug>
@@ -75,6 +76,7 @@
 #include "qt/core/glue/oxide_qt_web_frame_proxy_client.h"
 #include "qt/core/glue/oxide_qt_web_view_proxy_client.h"
 #include "qt/core/glue/touch_editing_menu.h"
+#include "qt/core/glue/web_autofill_popup.h"
 #include "qt/core/glue/web_context_menu.h"
 #include "qt/core/glue/web_context_menu_params.h"
 #include "shared/browser/oxide_browser_process_main.h"
@@ -103,6 +105,7 @@
 #include "oxide_qt_type_conversions.h"
 #include "oxide_qt_web_context.h"
 #include "oxide_qt_web_frame.h"
+#include "web_autofill_popup_host.h"
 #include "web_contents_id_tracker.h"
 #include "web_context_menu_host.h"
 #include "web_preferences.h"
@@ -693,6 +696,28 @@ std::unique_ptr<oxide::WebContextMenu> WebView::CreateContextMenu(
   return std::move(host);
 }
 
+std::unique_ptr<oxide::WebAutofillPopup> WebView::CreateAutofillPopup(
+    const std::vector<autofill::Suggestion>& suggestions,
+    const gfx::RectF& bounds,
+    oxide::WebAutofillPopupClient* client) {
+  std::unique_ptr<WebAutofillPopupHost> host =
+      base::MakeUnique<WebAutofillPopupHost>(client);
+  QRectF qt_bounds = ToQt(
+      DpiUtils::ConvertChromiumPixelsToQt(bounds, contents_view_->GetScreen()));
+  std::unique_ptr<WebAutofillPopup> popup =
+      aux_ui_factory_->CreateWebAutofillPopup(
+          WebAutofillPopupHost::BuildSuggestions(suggestions),
+          qt_bounds,
+          host.get());
+  if (!popup) {
+    return nullptr;
+  }
+
+  host->Init(std::move(popup));
+
+  return std::move(host);
+}
+
 std::unique_ptr<oxide::TouchEditingMenuController>
 WebView::CreateOverrideTouchEditingMenuController(
     oxide::TouchEditingMenuControllerClient* client) {
diff --git a/qt/core/browser/oxide_qt_web_view.h b/qt/core/browser/oxide_qt_web_view.h
index 5da67af..f0d3e50 100644
--- a/qt/core/browser/oxide_qt_web_view.h
+++ b/qt/core/browser/oxide_qt_web_view.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -154,6 +154,10 @@ class WebView : public oxide::WebViewClient,
       const content::ContextMenuParams& params,
       const std::vector<content::MenuItem>& items,
       oxide::WebContextMenuClient* client) override;
+  std::unique_ptr<oxide::WebAutofillPopup> CreateAutofillPopup(
+      const std::vector<autofill::Suggestion>& suggestions,
+      const gfx::RectF& bounds,
+      oxide::WebAutofillPopupClient* client) override;
   std::unique_ptr<oxide::TouchEditingMenuController>
   CreateOverrideTouchEditingMenuController(
       oxide::TouchEditingMenuControllerClient* client) override;
diff --git a/qt/core/browser/web_autofill_popup_host.cc b/qt/core/browser/web_autofill_popup_host.cc
new file mode 100644
index 0000000..05fe479
--- /dev/null
+++ b/qt/core/browser/web_autofill_popup_host.cc
@@ -0,0 +1,139 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "web_autofill_popup_host.h"
+
+#include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
+#include "components/autofill/core/browser/popup_item_ids.h"
+#include "components/autofill/core/browser/suggestion.h"
+
+#include "qt/core/glue/web_autofill_popup.h"
+#include "shared/browser/autofill/web_autofill_popup_client.h"
+
+namespace oxide {
+namespace qt {
+
+void WebAutofillPopupHost::Show() {
+  popup_->Show();
+}
+
+void WebAutofillPopupHost::UpdateDataListValues(
+    const std::vector<base::string16>& values,
+    const std::vector<base::string16>& labels) {
+  std::vector<AutofillSuggestion> suggestions;
+  for (unsigned int i = 0; i < values.size(); ++i) {
+    AutofillSuggestion suggestion;
+    suggestion.frontend_id = autofill::POPUP_ITEM_ID_DATALIST_ENTRY;
+    suggestion.type = AutofillSuggestion::Type::DataListEntry;
+    suggestion.value = QString::fromStdString(base::UTF16ToUTF8(values[i]));
+    suggestion.label = QString::fromStdString(base::UTF16ToUTF8(labels[i]));
+    suggestions.push_back(suggestion);
+  }
+
+  if (suggestions.size() >
+      static_cast<size_t>(std::numeric_limits<int>::max() + 1)) {
+    LOG(WARNING)
+        << "Truncating autofill popup - there are too many suggestions!";
+    suggestions.resize(std::numeric_limits<int>::max() + 1);
+  }
+
+  popup_->UpdateDataListValues(suggestions);
+}
+
+void WebAutofillPopupHost::Hide() {
+  popup_->Hide();
+}
+
+void WebAutofillPopupHost::Close() {
+  client_->Close();
+}
+
+void WebAutofillPopupHost::SelectSuggestion(
+    const AutofillSuggestion& suggestion) {
+  client_->SelectSuggestion(suggestion.frontend_id,
+                            base::UTF8ToUTF16(suggestion.value.toStdString()));
+}
+
+void WebAutofillPopupHost::ClearSelection() {
+  client_->ClearSelection();
+}
+
+void WebAutofillPopupHost::AcceptSuggestion(
+    const AutofillSuggestion& suggestion) {
+  client_->AcceptSuggestion(suggestion.frontend_id,
+                            base::UTF8ToUTF16(suggestion.value.toStdString()));
+}
+
+bool WebAutofillPopupHost::RemoveSuggestion(
+    const AutofillSuggestion& suggestion) {
+  return client_->RemoveSuggestion(
+      suggestion.frontend_id,
+      base::UTF8ToUTF16(suggestion.value.toStdString()));
+}
+
+WebAutofillPopupHost::WebAutofillPopupHost(
+    oxide::WebAutofillPopupClient* client)
+    : client_(client) {}
+
+WebAutofillPopupHost::~WebAutofillPopupHost() = default;
+
+void WebAutofillPopupHost::Init(std::unique_ptr<qt::WebAutofillPopup> popup) {
+  popup_ = std::move(popup);
+}
+
+// static
+std::vector<AutofillSuggestion> WebAutofillPopupHost::BuildSuggestions(
+    const std::vector<autofill::Suggestion>& suggestions) {
+  std::vector<autofill::Suggestion> local_suggestions = suggestions;
+  if (local_suggestions.size() >
+      static_cast<size_t>(std::numeric_limits<int>::max() + 1)) {
+    LOG(WARNING)
+        << "Truncating autofill popup - there are too many suggestions!";
+    local_suggestions.resize(std::numeric_limits<int>::max() + 1);
+  }
+
+  std::vector<AutofillSuggestion> rv;
+  for (const auto& suggestion : local_suggestions) {
+    int fid = suggestion.frontend_id;
+    if (fid > 0 ||
+        fid == autofill::POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY ||
+        fid == autofill::POPUP_ITEM_ID_PASSWORD_ENTRY ||
+        fid == autofill::POPUP_ITEM_ID_DATALIST_ENTRY) {
+      AutofillSuggestion as;
+      as.frontend_id = fid;
+      if (fid > 0) {
+        as.type = AutofillSuggestion::Type::ProfileEntry;
+      } else if (fid == autofill::POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY) {
+        as.type = AutofillSuggestion::Type::AutoCompleteEntry;
+      } else if (fid == autofill::POPUP_ITEM_ID_PASSWORD_ENTRY) {
+        as.type = AutofillSuggestion::Type::PasswordEntry;
+      } else if (fid == autofill::POPUP_ITEM_ID_DATALIST_ENTRY) {
+        as.type = AutofillSuggestion::Type::DataListEntry;
+      }
+      as.value = QString::fromStdString(base::UTF16ToUTF8(suggestion.value));
+      as.label = QString::fromStdString(base::UTF16ToUTF8(suggestion.label));
+      as.icon = QString::fromStdString(base::UTF16ToUTF8(suggestion.icon));
+      rv.push_back(as);
+    }
+  }
+
+  return std::move(rv);
+}
+
+} // namespace qt
+} // namespace oxide
diff --git a/qt/core/browser/web_autofill_popup_host.h b/qt/core/browser/web_autofill_popup_host.h
new file mode 100644
index 0000000..513e778
--- /dev/null
+++ b/qt/core/browser/web_autofill_popup_host.h
@@ -0,0 +1,78 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_BROWSER_WEB_AUTOFILL_POPUP_HOST_H_
+#define _OXIDE_QT_CORE_BROWSER_WEB_AUTOFILL_POPUP_HOST_H_
+
+#include <memory>
+#include <vector>
+
+#include "base/macros.h"
+
+#include "qt/core/glue/autofill_suggestion.h"
+#include "qt/core/glue/web_autofill_popup_client.h"
+#include "shared/browser/autofill/web_autofill_popup.h"
+
+namespace autofill {
+struct Suggestion;
+}
+
+namespace oxide {
+
+class WebAutofillPopupClient;
+
+namespace qt {
+
+class WebAutofillPopup;
+
+class WebAutofillPopupHost : public oxide::WebAutofillPopup,
+                             public WebAutofillPopupClient {
+ public:
+  WebAutofillPopupHost(oxide::WebAutofillPopupClient* client);
+  ~WebAutofillPopupHost() override;
+
+  void Init(std::unique_ptr<qt::WebAutofillPopup> popup);
+
+  static std::vector<AutofillSuggestion> BuildSuggestions(
+      const std::vector<autofill::Suggestion>& suggestions);
+
+ private:
+  // oxide::WebAutofillPopup implementation
+  void Show() override;
+  void UpdateDataListValues(
+      const std::vector<base::string16>& values,
+      const std::vector<base::string16>& labels) override;
+  void Hide() override;
+
+  // WebAutofillPopupClient implementation
+  void Close() override;
+  void SelectSuggestion(const AutofillSuggestion& suggestion) override;
+  void ClearSelection() override;
+  void AcceptSuggestion(const AutofillSuggestion& suggestion) override;
+  bool RemoveSuggestion(const AutofillSuggestion& suggestion) override;
+
+  oxide::WebAutofillPopupClient* client_; // Owns us
+
+  std::unique_ptr<qt::WebAutofillPopup> popup_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebAutofillPopupHost);
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_BROWSER_WEB_AUTOFILL_POPUP_HOST_H_
diff --git a/qt/core/glue/autofill_suggestion.cc b/qt/core/glue/autofill_suggestion.cc
new file mode 100644
index 0000000..5344a3d
--- /dev/null
+++ b/qt/core/glue/autofill_suggestion.cc
@@ -0,0 +1,30 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "autofill_suggestion.h"
+
+namespace oxide {
+namespace qt {
+
+AutofillSuggestion::AutofillSuggestion() = default;
+
+AutofillSuggestion::AutofillSuggestion(const AutofillSuggestion& other) = default;
+
+AutofillSuggestion::~AutofillSuggestion() = default;
+
+} // namespace qt
+} // namespace oxide
diff --git a/qt/core/glue/autofill_suggestion.h b/qt/core/glue/autofill_suggestion.h
new file mode 100644
index 0000000..01e4ad2
--- /dev/null
+++ b/qt/core/glue/autofill_suggestion.h
@@ -0,0 +1,50 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_GLUE_AUTOFILL_SUGGESTION_H_
+#define _OXIDE_QT_CORE_GLUE_AUTOFILL_SUGGESTION_H_
+
+#include <QString>
+
+#include "qt/core/api/oxideqglobal.h"
+
+namespace oxide {
+namespace qt {
+
+struct OXIDE_QTCORE_EXPORT AutofillSuggestion {
+  AutofillSuggestion();
+  AutofillSuggestion(const AutofillSuggestion& other);
+  ~AutofillSuggestion();
+
+  enum class Type {
+    ProfileEntry,
+    AutoCompleteEntry,
+    PasswordEntry,
+    DataListEntry
+  };
+
+  int frontend_id;
+  Type type;
+  QString value;
+  QString label;
+  QString icon;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_AUTOFILL_SUGGESTION_H_
diff --git a/qt/core/glue/auxiliary_ui_factory.h b/qt/core/glue/auxiliary_ui_factory.h
index 4150b1b..557cbcf 100644
--- a/qt/core/glue/auxiliary_ui_factory.h
+++ b/qt/core/glue/auxiliary_ui_factory.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2016 Canonical Ltd.
+// Copyright (C) 2016-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,10 +23,12 @@
 
 #include <QtGlobal>
 
+#include "qt/core/glue/autofill_suggestion.h"
 #include "qt/core/glue/edit_capability_flags.h"
 #include "qt/core/glue/menu_item.h"
 
 QT_BEGIN_NAMESPACE
+class QRectF;
 class QString;
 class QUrl;
 QT_END_NAMESPACE
@@ -39,6 +41,8 @@ class JavaScriptDialogClient;
 enum class JavaScriptDialogType;
 class TouchEditingMenu;
 class TouchEditingMenuClient;
+class WebAutofillPopup;
+class WebAutofillPopupClient;
 class WebContextMenu;
 class WebContextMenuClient;
 struct WebContextMenuParams;
@@ -52,6 +56,11 @@ class AuxiliaryUIFactory {
       const std::vector<MenuItem>& items,
       WebContextMenuClient* client) = 0;
 
+  virtual std::unique_ptr<WebAutofillPopup> CreateWebAutofillPopup(
+      const std::vector<AutofillSuggestion>& suggestions,
+      const QRectF& bounds,
+      WebAutofillPopupClient* client) = 0;
+
   virtual std::unique_ptr<TouchEditingMenu> CreateTouchEditingMenu(
       EditCapabilityFlags edit_flags,
       TouchEditingMenuClient* client) = 0;
diff --git a/qt/core/glue/oxide_qt_web_context_proxy.h b/qt/core/glue/oxide_qt_web_context_proxy.h
index ff13a71..49f0180 100644
--- a/qt/core/glue/oxide_qt_web_context_proxy.h
+++ b/qt/core/glue/oxide_qt_web_context_proxy.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -137,6 +137,9 @@ class OXIDE_QTCORE_EXPORT WebContextProxy : public ProxyBase<WebContext> {
 
   virtual bool doNotTrack() const = 0;
   virtual void setDoNotTrack(bool dnt) = 0;
+
+  virtual bool autofillEnabled() const = 0;
+  virtual void setAutofillEnabled(bool enabled) = 0;
 };
 
 } // namespace qt
diff --git a/qt/core/glue/web_autofill_popup.h b/qt/core/glue/web_autofill_popup.h
new file mode 100644
index 0000000..c28d561
--- /dev/null
+++ b/qt/core/glue/web_autofill_popup.h
@@ -0,0 +1,43 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_GLUE_WEB_AUTOFILL_POPUP_H_
+#define _OXIDE_QT_CORE_GLUE_WEB_AUTOFILL_POPUP_H_
+
+#include <vector>
+
+namespace oxide {
+namespace qt {
+
+class AutofillSuggestion;
+
+class WebAutofillPopup {
+ public:
+  virtual ~WebAutofillPopup() = default;
+
+  virtual void Show() = 0;
+
+  virtual void UpdateDataListValues(
+      const std::vector<AutofillSuggestion>& suggestions) = 0;
+
+  virtual void Hide() = 0;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_WEB_AUTOFILL_POPUP_H_
diff --git a/qt/core/glue/web_autofill_popup_client.h b/qt/core/glue/web_autofill_popup_client.h
new file mode 100644
index 0000000..b31cae4
--- /dev/null
+++ b/qt/core/glue/web_autofill_popup_client.h
@@ -0,0 +1,40 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_GLUE_WEB_AUTOFILL_POPUP_CLIENT_H_
+#define _OXIDE_QT_CORE_GLUE_WEB_AUTOFILL_POPUP_CLIENT_H_
+
+namespace oxide {
+namespace qt {
+
+struct AutofillSuggestion;
+
+class WebAutofillPopupClient {
+ public:
+  virtual ~WebAutofillPopupClient() {}
+
+  virtual void Close() = 0;
+  virtual void SelectSuggestion(const AutofillSuggestion& suggestion) = 0;
+  virtual void ClearSelection() = 0;
+  virtual void AcceptSuggestion(const AutofillSuggestion& suggestion) = 0;
+  virtual bool RemoveSuggestion(const AutofillSuggestion& suggestion) = 0;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_WEB_AUTOFILL_POPUP_CLIENT_H_
diff --git a/qt/qmlplugin/oxide.qmltypes b/qt/qmlplugin/oxide.qmltypes
index 8a111b6..ab9848f 100644
--- a/qt/qmlplugin/oxide.qmltypes
+++ b/qt/qmlplugin/oxide.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -v -noinstantiate com.canonical.Oxide 1.19 com/canonical/Oxide'
+// 'qmlplugindump -v -noinstantiate com.canonical.Oxide 1.23 com/canonical/Oxide'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "OxideQCertificateError"
         prototype: "QObject"
@@ -414,11 +414,12 @@ Module {
         prototype: "QObject"
         exports: [
             "WebContext 1.0",
+            "WebContext 1.23",
             "WebContext 1.3",
             "WebContext 1.6",
             "WebContext 1.9"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 3]
+        exportMetaObjectRevisions: [0, 1, 2, 3, 4]
         Enum {
             name: "CookiePolicy"
             values: {
@@ -475,6 +476,7 @@ Module {
         Property { name: "defaultVideoCaptureDeviceId"; revision: 3; type: "string" }
         Property { name: "userAgentOverrides"; revision: 3; type: "QVariantList" }
         Property { name: "doNotTrackEnabled"; revision: 3; type: "bool" }
+        Property { name: "autofillEnabled"; revision: 4; type: "bool" }
         Signal { name: "devtoolsBindIpChanged" }
         Signal { name: "hostMappingRulesChanged"; revision: 1 }
         Signal { name: "allowedExtraUrlSchemesChanged"; revision: 1 }
@@ -483,6 +485,7 @@ Module {
         Signal { name: "defaultVideoCaptureDeviceIdChanged"; revision: 3 }
         Signal { name: "userAgentOverridesChanged"; revision: 3 }
         Signal { name: "doNotTrackEnabledChanged"; revision: 3 }
+        Signal { name: "autofillEnabledChanged"; revision: 4 }
         Method {
             name: "addUserScript"
             Parameter { name: "script"; type: "OxideQQuickUserScript"; isPointer: true }
@@ -575,7 +578,7 @@ Module {
             "WebView 1.8",
             "WebView 1.9"
         ]
-        exportMetaObjectRevisions: [0, 6, 7, 8, 9, 1, 2, 3, 4, 5]
+        exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
         attachedType: "OxideQQuickWebViewAttached"
         Enum {
             name: "LogMessageSeverityLevel"
@@ -972,423 +975,4 @@ Module {
         Property { name: "touchEnabled"; type: "bool" }
         Signal { name: "sansSerifFontFamilyChanged" }
     }
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-            Parameter { name: "roles"; type: "QVector<int>" }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-        }
-        Signal {
-            name: "headerDataChanged"
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutChanged" }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutAboutToBeChanged" }
-        Signal {
-            name: "rowsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal { name: "modelAboutToBeReset" }
-        Signal { name: "modelReset" }
-        Signal {
-            name: "rowsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationRow"; type: "int" }
-        }
-        Signal {
-            name: "rowsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "row"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationColumn"; type: "int" }
-        }
-        Signal {
-            name: "columnsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method { name: "submit"; type: "bool" }
-        Method { name: "revert" }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "parent"
-            type: "QModelIndex"
-            Parameter { name: "child"; type: "QModelIndex" }
-        }
-        Method {
-            name: "sibling"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "idx"; type: "QModelIndex" }
-        }
-        Method {
-            name: "rowCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "rowCount"; type: "int" }
-        Method {
-            name: "columnCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "columnCount"; type: "int" }
-        Method {
-            name: "hasChildren"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "hasChildren"; type: "bool" }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-        }
-        Method {
-            name: "fetchMore"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "canFetchMore"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "flags"
-            type: "Qt::ItemFlags"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-            Parameter { name: "flags"; type: "Qt::MatchFlags" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-    }
-    Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
-    Component {
-        name: "QQuickItem"
-        defaultProperty: "data"
-        prototype: "QObject"
-        Enum {
-            name: "TransformOrigin"
-            values: {
-                "TopLeft": 0,
-                "Top": 1,
-                "TopRight": 2,
-                "Left": 3,
-                "Center": 4,
-                "Right": 5,
-                "BottomLeft": 6,
-                "Bottom": 7,
-                "BottomRight": 8
-            }
-        }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
-    }
 }
diff --git a/qt/qmlplugin/oxide_qml_plugin.cc b/qt/qmlplugin/oxide_qml_plugin.cc
index 1597b5d..b56fb51 100644
--- a/qt/qmlplugin/oxide_qml_plugin.cc
+++ b/qt/qmlplugin/oxide_qml_plugin.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -215,6 +215,8 @@ class OxideQmlPlugin : public QQmlExtensionPlugin {
     qmlRegisterUncreatableType<OxideQQuickNavigationHistory, 1>(
         uri, 1, 19, "NavigationHistory",
         "NavigationHistory is accessed via WebView.navigationHistory");
+
+    qmlRegisterType<OxideQQuickWebContext, 4>(uri, 1, 23, "WebContext");
   }
 };
 
diff --git a/qt/quick/api/oxideqquickwebcontext.cc b/qt/quick/api/oxideqquickwebcontext.cc
index 6fe1ef7..1946af0 100644
--- a/qt/quick/api/oxideqquickwebcontext.cc
+++ b/qt/quick/api/oxideqquickwebcontext.cc
@@ -1561,4 +1561,35 @@ void OxideQQuickWebContext::setDoNotTrack(bool dnt) {
   emit doNotTrackEnabledChanged();
 }
 
+/*!
+\qmlproperty bool WebContext::autofillEnabled
+\since OxideQt 1.22
+
+Whether to enable autofill. The default is false.
+
+Autofill is most probably neither useful nor desirable outside of the browser
+use case, and as such is disabled by default.
+
+The base Oxide WebView does not know how to display autofill suggestions,
+use the WebView from the Oxide.Ubuntu module if you need them.
+*/
+
+bool OxideQQuickWebContext::autofillEnabled() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->proxy_->autofillEnabled();
+}
+
+void OxideQQuickWebContext::setAutofillEnabled(bool enabled) {
+  Q_D(OxideQQuickWebContext);
+
+  if (autofillEnabled() == enabled) {
+    return;
+  }
+
+  d->proxy_->setAutofillEnabled(enabled);
+
+  emit autofillEnabledChanged();
+}
+
 #include "moc_oxideqquickwebcontext.cpp"
diff --git a/qt/quick/api/oxideqquickwebcontext.h b/qt/quick/api/oxideqquickwebcontext.h
index 99de73a..f8ca6fa 100644
--- a/qt/quick/api/oxideqquickwebcontext.h
+++ b/qt/quick/api/oxideqquickwebcontext.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -77,6 +77,8 @@ class OXIDE_QTQUICK_EXPORT OxideQQuickWebContext : public QObject,
 
   Q_PROPERTY(bool doNotTrackEnabled READ doNotTrack WRITE setDoNotTrack NOTIFY doNotTrackEnabledChanged REVISION 3)
 
+  Q_PROPERTY(bool autofillEnabled READ autofillEnabled WRITE setAutofillEnabled NOTIFY autofillEnabledChanged REVISION 4)
+
   Q_ENUMS(CookiePolicy)
   Q_ENUMS(SessionCookieMode)
 
@@ -173,6 +175,9 @@ class OXIDE_QTQUICK_EXPORT OxideQQuickWebContext : public QObject,
   bool doNotTrack() const;
   void setDoNotTrack(bool dnt);
 
+  bool autofillEnabled() const;
+  void setAutofillEnabled(bool enabled);
+
  Q_SIGNALS:
   void productChanged();
   void userAgentChanged();
@@ -196,6 +201,7 @@ class OXIDE_QTQUICK_EXPORT OxideQQuickWebContext : public QObject,
   Q_REVISION(3) void defaultVideoCaptureDeviceIdChanged();
   Q_REVISION(3) void userAgentOverridesChanged();
   Q_REVISION(3) void doNotTrackEnabledChanged();
+  Q_REVISION(4) void autofillEnabledChanged();
 
  protected:
   // QQmlParserStatus implementation
diff --git a/qt/quick/qquick_legacy_auxiliary_ui_factory.cc b/qt/quick/qquick_legacy_auxiliary_ui_factory.cc
index c0084c2..e50b6c3 100644
--- a/qt/quick/qquick_legacy_auxiliary_ui_factory.cc
+++ b/qt/quick/qquick_legacy_auxiliary_ui_factory.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2016 Canonical Ltd.
+// Copyright (C) 2016-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,7 @@
 
 #include "qt/core/glue/javascript_dialog_type.h"
 #include "qt/core/glue/touch_editing_menu.h"
+#include "qt/core/glue/web_autofill_popup.h"
 
 #include "qquick_legacy_alert_dialog.h"
 #include "qquick_legacy_before_unload_dialog.h"
@@ -31,11 +32,13 @@
 namespace oxide {
 namespace qquick {
 
+using qt::AutofillSuggestion;
 using qt::EditCapabilityFlags;
 using qt::JavaScriptDialogClient;
 using qt::JavaScriptDialogType;
 using qt::MenuItem;
 using qt::TouchEditingMenuClient;
+using qt::WebAutofillPopupClient;
 using qt::WebContextMenuClient;
 using qt::WebContextMenuParams;
 
@@ -52,6 +55,15 @@ LegacyAuxiliaryUIFactory::CreateWebContextMenu(
       new LegacyWebContextMenu(item_, context_menu_, params, client));
 }
 
+std::unique_ptr<qt::WebAutofillPopup>
+LegacyAuxiliaryUIFactory::CreateWebAutofillPopup(
+    const std::vector<AutofillSuggestion>& suggestions,
+    const QRectF& bounds,
+    WebAutofillPopupClient* client) {
+  Q_ASSERT(0);
+  return nullptr;
+}
+
 std::unique_ptr<qt::TouchEditingMenu>
 LegacyAuxiliaryUIFactory::CreateTouchEditingMenu(
     EditCapabilityFlags edit_flags,
diff --git a/qt/quick/qquick_legacy_auxiliary_ui_factory.h b/qt/quick/qquick_legacy_auxiliary_ui_factory.h
index a7cec12..e969e6e 100644
--- a/qt/quick/qquick_legacy_auxiliary_ui_factory.h
+++ b/qt/quick/qquick_legacy_auxiliary_ui_factory.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2016 Canonical Ltd.
+// Copyright (C) 2016-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -59,6 +59,10 @@ class LegacyAuxiliaryUIFactory : public qt::AuxiliaryUIFactory {
       const qt::WebContextMenuParams& params,
       const std::vector<qt::MenuItem>& items,
       qt::WebContextMenuClient* client) override;
+  std::unique_ptr<qt::WebAutofillPopup> CreateWebAutofillPopup(
+      const std::vector<qt::AutofillSuggestion>& suggestions,
+      const QRectF& bounds,
+      qt::WebAutofillPopupClient* client) override;
   std::unique_ptr<qt::TouchEditingMenu> CreateTouchEditingMenu(
       qt::EditCapabilityFlags edit_flags,
       qt::TouchEditingMenuClient* client) override;
diff --git a/qt/tests/qmltests/api/tst_WebContext_autofillEnabled.qml b/qt/tests/qmltests/api/tst_WebContext_autofillEnabled.qml
new file mode 100644
index 0000000..7350196
--- /dev/null
+++ b/qt/tests/qmltests/api/tst_WebContext_autofillEnabled.qml
@@ -0,0 +1,38 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.22
+import Oxide.testsupport 1.0
+
+TestWebView {
+  id: webView
+
+  SignalSpy {
+    id: spy
+    signalName: "autofillEnabledChanged"
+  }
+
+  TestCase {
+    name: "WebContext_autofillEnabled"
+    when: windowShown
+
+    function test_WebContext_autofillEnabled1_default() {
+      compare(webView.context.autofillEnabled, false,
+              "Autofill should be disabled by default");
+    }
+
+    function test_WebContext_autofillEnabled2_get_set() {
+      spy.target = webView.context;
+
+      verify(!webView.context.autofillEnabled);
+      compare(spy.count, 0);
+
+      webView.context.autofillEnabled = true;
+      compare(spy.count, 1);
+      verify(webView.context.autofillEnabled);
+
+      webView.context.autofillEnabled = false;
+      compare(spy.count, 2);
+      verify(!webView.context.autofillEnabled);
+    }
+  }
+}
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.html b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.html
new file mode 100644
index 0000000..e28755c
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.html
@@ -0,0 +1,23 @@
+<html>
+ <body>
+  <form action="empty.html">
+   <input id="firstname" name="firstname" type="text" required autofocus />
+   <br />
+   <input id="lastname" name="lastname" type="text" required />
+   <br />
+   <input id="email" name="email" type="text" required />
+   <br />
+   <input id="country" name="country" type="text" required />
+   <br />
+   <input id="state" name="state" type="text" />
+   <br />
+   <input id="zipcode" name="zipcode" type="text" required />
+   <br />
+   <input id="city" name="city" type="text" required />
+   <br />
+   <input id="street" name="street" type="text" required />
+   <br />
+   <input type="submit" value="Submit" />
+  </form>
+ </body>
+</html>
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.qml b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.qml
new file mode 100644
index 0000000..e65d221
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.qml
@@ -0,0 +1,300 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.22
+import Oxide.Ubuntu 1.0
+import Oxide.testsupport 1.0
+import Ubuntu.Components 1.3
+
+FocusScope {
+  width: 800
+  height: 600
+
+  focus: true
+
+  UbuntuTestWebView {
+    id: webView
+    objectName: "webView"
+    anchors.fill: parent
+    visible: false
+  }
+
+  UbuntuTestWebView {
+    id: incognitoWebView
+    objectName: "incognitoWebView"
+    anchors.fill: parent
+    incognito: true
+    visible: false
+  }
+
+  TestCase {
+    name: "WebViewAutofillPopup_autofill_profiles"
+    when: windowShown
+
+    function loadForm(webView) {
+      webView.visible = true;
+      webView.focus = true;
+      webView.context.autofillEnabled = true;
+      webView.url =
+          "http://testsuite/tst_WebViewAutofillPopup_autofill_profiles.html";
+      verify(webView.waitForLoadSucceeded());
+    }
+
+    function verify_field_focused(webView, field) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.activeElement.id") == field; }));
+    }
+
+    function compare_field_value(webView, field, value) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.querySelector('#%1').value".arg(field)) == value; }));
+    }
+
+    function typeStringInField(webView, string, field) {
+      verify_field_focused(webView, field);
+      for (var i = 0; i < string.length; ++i) {
+        keyClick(string[i]);
+      }
+      compare_field_value(webView, field, string);
+    }
+
+    function inputAndValidateProfile(webView, data) {
+      var fields = ["firstname", "lastname", "email", "country", "state",
+                    "zipcode", "city", "street"];
+      for (var i = 0; i < fields.length; ++i) {
+          typeStringInField(webView, data[i], fields[i]);
+          keyClick(Qt.Key_Tab);
+        }
+        keyClick(Qt.Key_Enter);
+        verify(webView.waitForLoadSucceeded());
+        loadForm(webView);
+    }
+
+    function initTestCase() {
+      loadForm(webView);
+
+      // Initial population of the autofill profiles database
+      var data = [
+          ["John", "Doe", "[e-mail]",
+           "US", "New York", "10016", "NYC", "Park Avenue"],
+          ["John", "Lennon", "[e-mail]",
+           "UK", "", "L25 6DA", "Liverpool", "Beaconsfield Road"],
+          ["Bruce", "Lee", "[e-mail]",
+           "US", "California", "94108", "San Francisco", "Joice Street"],
+      ];
+      for (var i = 0; i < data.length; ++i) {
+        inputAndValidateProfile(webView, data[i]);
+      }
+    }
+
+    function getAutofillPopup(webView) {
+      return TestSupport.findItemInScene(
+          TestWindow.rootItem, "%1_WebAutofillPopup".arg(webView.objectName));
+    }
+
+    function waitForAutofillPopupToClose(webView) {
+      var popup = getAutofillPopup(webView);
+      if (!popup) {
+        return true;
+      }
+
+      var helper = TestSupport.createQObjectTestHelper(popup);
+
+      return TestUtils.waitFor(function() {
+          return !getAutofillPopup(webView); }) &&
+             TestUtils.waitFor(function() { return helper.destroyed; });
+    }
+
+    function waitForAutofillPopup(webView, timeout) {
+      return TestUtils.waitFor(function() {
+          return !!getAutofillPopup(webView) &&
+                 getAutofillPopup(webView).visible; },
+          timeout);
+    }
+
+    function getSuggestion(webView, index) {
+      return TestSupport.findItemInScene(
+          TestWindow.rootItem,
+          "%1_WebAutofillPopup_item%2".arg(webView.objectName).arg(index));
+    }
+
+    function compareBoundsToClientRect(bounds, rect) {
+      compare(bounds.x, rect.x);
+      compare(bounds.y, rect.y);
+      compare(bounds.width, rect.width);
+      compare(bounds.height, rect.height);
+    }
+
+    function init() {
+      loadForm(webView);
+    }
+
+    function get_webviews_data() {
+      var data = [ { webView: webView } ];
+      if (incognitoWebView.incognito) {
+        // When run in single process mode, incognito cannot be set
+        data.push({ webView: incognitoWebView });
+      }
+      return data;
+    }
+
+    function test_initial_state_data() {
+      return get_webviews_data();
+    }
+
+    function test_initial_state(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "jo", "firstname");
+      var popup = getAutofillPopup(data.webView);
+      var r = data.webView.getTestApi()
+          .getBoundingClientRectForSelector("#firstname");
+      compareBoundsToClientRect(popup.elementBounds, r);
+      compare(popup.currentIndex, -1);
+      compare(popup.count, 2);
+      compare(getSuggestion(data.webView, 0).value, "John");
+      compare(getSuggestion(data.webView, 1).value, "John");
+      data.webView.visible = false;
+    }
+
+    function test_toggle_autofillEnabled_data() {
+      return get_webviews_data();
+    }
+
+    function test_toggle_autofillEnabled(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "j", "firstname");
+      verify(waitForAutofillPopup(data.webView));
+      keyClick(Qt.Key_Backspace);
+      verify(waitForAutofillPopupToClose(data.webView));
+
+      data.webView.context.autofillEnabled = false;
+      typeStringInField(data.webView, "j", "firstname");
+      verify(!waitForAutofillPopup(data.webView, 1000));
+      keyClick(Qt.Key_Backspace);
+
+      data.webView.context.autofillEnabled = true;
+      typeStringInField(data.webView, "j", "firstname");
+      verify(waitForAutofillPopup(data.webView));
+      data.webView.visible = false;
+    }
+
+    function test_escape_dismisses_popup_and_resets_field_value_data() {
+      return get_webviews_data();
+    }
+
+    function test_escape_dismisses_popup_and_resets_field_value(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "br", "firstname");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      compare(popup.count, 1);
+      compare(getSuggestion(data.webView, 0).value, "Bruce");
+      keyClick(Qt.Key_Down);
+      tryCompare(popup, "currentIndex", 0);
+      keyClick(Qt.Key_Escape);
+      verify(waitForAutofillPopupToClose(data.webView));
+      compare_field_value(data.webView, "firstname", "br");
+      compare_field_value(data.webView, "lastname", "");
+      compare_field_value(data.webView, "email", "");
+      compare_field_value(data.webView, "country", "");
+      compare_field_value(data.webView, "state", "");
+      compare_field_value(data.webView, "zipcode", "");
+      compare_field_value(data.webView, "city", "");
+      compare_field_value(data.webView, "street", "");
+      data.webView.visible = false;
+    }
+
+    function test_validate_suggestion_with_mouse_data() {
+      return get_webviews_data();
+    }
+
+    function test_validate_suggestion_with_mouse(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "br", "firstname");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      compare(popup.count, 1);
+      compare(getSuggestion(data.webView, 0).value, "Bruce");
+      var item = getSuggestion(data.webView, 0);
+      mouseClick(item);
+      verify(waitForAutofillPopupToClose(data.webView));
+      verify_field_focused(data.webView, "firstname");
+      compare_field_value(data.webView, "firstname", "Bruce");
+      compare_field_value(data.webView, "lastname", "Lee");
+      compare_field_value(data.webView, "email", "[e-mail]");
+      compare_field_value(data.webView, "state", "California");
+      compare_field_value(data.webView, "zipcode", "94108");
+      compare_field_value(data.webView, "city", "San Francisco");
+      compare_field_value(data.webView, "street", "Joice Street");
+      data.webView.visible = false;
+    }
+
+    function test_validate_suggestion_with_keyboard_data() {
+      return [
+          { webView: webView, key: Qt.Key_Enter, focus: "lastname" },
+          { webView: webView, key: Qt.Key_Return, focus: "lastname" },
+          { webView: webView, key: Qt.Key_Tab, focus: "email" },
+          { webView: incognitoWebView, key: Qt.Key_Enter, focus: "lastname" },
+          { webView: incognitoWebView, key: Qt.Key_Return, focus: "lastname" },
+          { webView: incognitoWebView, key: Qt.Key_Tab, focus: "email" },
+      ];
+    }
+
+    function test_validate_suggestion_with_keyboard(data) {
+      loadForm(data.webView);
+      keyClick(Qt.Key_Tab);
+      typeStringInField(data.webView, "len", "lastname");
+      var popup = getAutofillPopup(data.webView);
+      compare(popup.count, 1);
+      compare(getSuggestion(data.webView, 0).value, "Lennon");
+      keyClick(Qt.Key_Down);
+      tryCompare(popup, "currentIndex", 0);
+      keyClick(data.key);
+      verify(waitForAutofillPopupToClose(data.webView));
+      verify_field_focused(data.webView, data.focus);
+      compare_field_value(data.webView, "firstname", "John");
+      compare_field_value(data.webView, "lastname", "Lennon");
+      compare_field_value(data.webView, "email", "[e-mail]");
+      compare_field_value(data.webView, "state", "");
+      compare_field_value(data.webView, "zipcode", "L25 6DA");
+      compare_field_value(data.webView, "city", "Liverpool");
+      compare_field_value(data.webView, "street", "Beaconsfield Road");
+      data.webView.visible = false;
+    }
+
+    function test_shiftdel_deletes_suggestion() {
+      var data = ["Paul", "McCartney", "[e-mail]",
+                  "UK", "", "L18 1DE", "Liverpool", "Penny Lane"];
+      inputAndValidateProfile(webView, data);
+      for (var i = 0; i < 6; ++i) {
+        keyClick(Qt.Key_Tab);
+      }
+      typeStringInField(webView, "Live", "city");
+      verify(waitForAutofillPopup(webView));
+      var popup = getAutofillPopup(webView);
+      compare(popup.count, 2);
+      compare(getSuggestion(webView, 0).label, "Penny Lane");
+      compare(getSuggestion(webView, 1).label, "Beaconsfield Road");
+      keyClick(Qt.Key_Down);
+      tryCompare(popup, "currentIndex", 0);
+      keyClick(Qt.Key_Delete, Qt.ShiftModifier);
+      tryCompare(popup, "currentIndex", -1);
+      tryCompare(popup, "count", 1);
+      compare(getSuggestion(webView, 0).label, "Beaconsfield Road");
+    }
+
+    function test_incognito_profile_not_saved() {
+      if (!incognitoWebView.incognito) {
+        skip("WebView.incognito cannot be set in single process mode");
+      }
+      loadForm(incognitoWebView);
+      var data = ["Paul", "McCartney", "[e-mail]",
+                  "UK", "", "L18 1DE", "Liverpool", "Penny Lane"];
+      inputAndValidateProfile(incognitoWebView, data);
+      typeStringInField(incognitoWebView, "P", "firstname");
+      verify(!waitForAutofillPopup(incognitoWebView, 1000));
+      incognitoWebView.visible = false;
+    }
+  }
+}
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_datalist.html b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_datalist.html
new file mode 100644
index 0000000..cded135
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_datalist.html
@@ -0,0 +1,37 @@
+<html>
+ <body>
+  <form action="tst_WebViewAutofillPopup_datalist.html">
+   <input id="static" name="static" list="staticdatalist" type="text" autofocus />
+   <datalist id="staticdatalist">
+     <option>bar</option>
+     <option>baz</option>
+     <option>qux</option>
+   </datalist>
+   <br />
+   <input id="static2" name="static2" list="staticdatalist" type="text" />
+   <br />
+   <input id="dynamic" name="dynamic" list="dynamicdatalist" type="text" />
+   <datalist id="dynamicdatalist"></datalist>
+   <script>
+     function createDatalist() {
+       var value = document.getElementById("dynamic").value;
+       var list = [];
+       if (value == "f") {
+         list = ["foo", "flip"];
+       } else if (value == "b") {
+         list = ["bar", "beard", "beam"];
+       }
+       var datalist = document.getElementById("dynamicdatalist");
+       datalist.innerHTML = "";
+       for (var i = 0; i < list.length; ++i) {
+         var option = document.createElement('option');
+         option.value = list[i];
+         datalist.appendChild(option);
+       }
+     }
+     document.getElementById("dynamic").addEventListener("input", createDatalist);
+   </script>
+   <input type="submit" value="Submit" />
+  </form>
+ </body>
+</html>
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_datalist.qml b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_datalist.qml
new file mode 100644
index 0000000..1288857
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_datalist.qml
@@ -0,0 +1,157 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.22
+import Oxide.Ubuntu 1.0
+import Oxide.testsupport 1.0
+import Ubuntu.Components 1.3
+
+UbuntuTestWebView {
+  id: webView
+  objectName: "webView"
+
+  width: 800
+  height: 600
+
+  focus: true
+
+  TestCase {
+    name: "WebViewAutofillPopup_datalist"
+    when: windowShown
+
+    function verify_field_focused(field) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.activeElement.id") == field; }));
+    }
+
+    function compare_field_value(field, value) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.querySelector('#%1').value".arg(field)) == value; }));
+    }
+
+    function typeStringInField(string, field) {
+      verify_field_focused(field);
+      for (var i = 0; i < string.length; ++i) {
+        keyClick(string[i]);
+      }
+      compare_field_value(field, string);
+    }
+
+    function initTestCase() {
+      webView.context.autofillEnabled = true;
+    }
+
+    function getAutofillPopup() {
+      return TestSupport.findItemInScene(TestWindow.rootItem,
+                                         "webView_WebAutofillPopup");
+    }
+
+    function waitForAutofillPopupToClose() {
+      var popup = getAutofillPopup();
+      if (!popup) {
+        return true;
+      }
+
+      var helper = TestSupport.createQObjectTestHelper(popup);
+
+      return TestUtils.waitFor(function() { return !getAutofillPopup(); }) &&
+             TestUtils.waitFor(function() { return helper.destroyed; });
+    }
+
+    function waitForAutofillPopup() {
+      return TestUtils.waitFor(function() {
+          return !!getAutofillPopup() && getAutofillPopup().visible; });
+    }
+
+    function getSuggestion(index) {
+      return TestSupport.findItemInScene(
+          TestWindow.rootItem, "webView_WebAutofillPopup_item%1".arg(index));
+    }
+
+    function init() {
+      webView.url =
+          "http://testsuite/tst_WebViewAutofillPopup_datalist.html";
+      verify(webView.waitForLoadSucceeded());
+    }
+
+    function test_static_datalist() {
+      typeStringInField("b", "static");
+      verify(waitForAutofillPopup());
+      var popup = getAutofillPopup();
+      compare(popup.count, 2);
+      compare(getSuggestion(0).value, "bar");
+      compare(getSuggestion(1).value, "baz");
+      keyClick("a");
+      compare(popup.count, 2);
+      keyClick("e");
+      verify(waitForAutofillPopupToClose());
+
+      keyClick(Qt.Key_Backspace);
+      verify(waitForAutofillPopup());
+      popup = getAutofillPopup();
+      compare(popup.count, 2);
+      keyClick(Qt.Key_Backspace);
+      keyClick(Qt.Key_Backspace);
+      verify(waitForAutofillPopupToClose());
+
+      typeStringInField("q", "static");
+      verify(waitForAutofillPopup());
+      popup = getAutofillPopup();
+      compare(popup.count, 1);
+      compare(getSuggestion(0).value, "qux");
+      compare(popup.currentIndex, -1);
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 0);
+      keyClick(Qt.Key_Return);
+      verify(waitForAutofillPopupToClose());
+      compare_field_value("static", "qux");
+    }
+
+    function test_combined_datalist_autofill_suggestions() {
+      keyClick(Qt.Key_Tab);
+      typeStringInField("quantal", "static2");
+      keyClick(Qt.Key_Enter);
+      verify(webView.waitForLoadSucceeded());
+
+      keyClick(Qt.Key_Tab);
+      typeStringInField("q", "static2");
+      verify(waitForAutofillPopup());
+      var popup = getAutofillPopup();
+      compare(popup.count, 2);
+      compare(getSuggestion(0).value, "qux");
+      compare(getSuggestion(1).value, "quantal");
+    }
+
+    function test_dynamic_datalist() {
+      keyClick(Qt.Key_Tab);
+      keyClick(Qt.Key_Tab);
+      typeStringInField("f", "dynamic");
+      verify(waitForAutofillPopup());
+      var popup = getAutofillPopup();
+      compare(popup.count, 2);
+      compare(getSuggestion(0).value, "foo");
+      compare(getSuggestion(1).value, "flip");
+      keyClick("a");
+      verify(waitForAutofillPopupToClose());
+      keyClick(Qt.Key_Backspace);
+      verify(waitForAutofillPopup());
+      keyClick(Qt.Key_Backspace);
+      verify(waitForAutofillPopupToClose());
+      compare_field_value("dynamic", "");
+
+      typeStringInField("b", "dynamic");
+      verify(waitForAutofillPopup());
+      popup = getAutofillPopup();
+      compare(popup.count, 3);
+      compare(getSuggestion(0).value, "bar");
+      compare(getSuggestion(1).value, "beard");
+      compare(getSuggestion(2).value, "beam");
+      keyClick(Qt.Key_Up);
+      compare(popup.currentIndex, 2);
+      keyClick(Qt.Key_Enter);
+      verify(waitForAutofillPopupToClose());
+      compare_field_value("dynamic", "beam");
+    }
+  }
+}
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_passwords.html b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_passwords.html
new file mode 100644
index 0000000..8a712e6
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_passwords.html
@@ -0,0 +1,11 @@
+<html>
+ <body>
+  <form action="empty.html">
+   <input id="username" name="username" type="text" required autofocus />
+   <br />
+   <input id="password" name="password" type="password" required />
+   <br />
+   <input type="submit" value="Submit" />
+  </form>
+ </body>
+</html>
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_passwords.qml b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_passwords.qml
new file mode 100644
index 0000000..b1aede3
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_passwords.qml
@@ -0,0 +1,105 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.22
+import Oxide.Ubuntu 1.0
+import Oxide.testsupport 1.0
+import Ubuntu.Components 1.3
+
+UbuntuTestWebView {
+  id: webView
+  objectName: "webView"
+
+  width: 800
+  height: 600
+
+  focus: true
+
+  TestCase {
+    name: "WebViewAutofillPopup_passwords"
+    when: windowShown
+
+    function loadForm() {
+      webView.url =
+          "http://testsuite/tst_WebViewAutofillPopup_passwords.html";
+      verify(webView.waitForLoadSucceeded());
+    }
+
+    function verify_field_focused(field) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.activeElement.id") == field; }));
+    }
+
+    function compare_field_value(field, value) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.querySelector('#%1').value".arg(field)) == value; }));
+    }
+
+    function typeStringInField(string, field) {
+      verify_field_focused(field);
+      for (var i = 0; i < string.length; ++i) {
+        keyClick(string[i]);
+      }
+      compare_field_value(field, string);
+    }
+
+    function initTestCase() {
+      webView.context.autofillEnabled = true;
+    }
+
+    function getAutofillPopup() {
+      return TestSupport.findItemInScene(TestWindow.rootItem,
+                                         "webView_WebAutofillPopup");
+    }
+
+    function waitForAutofillPopupToClose() {
+      var popup = getAutofillPopup();
+      if (!popup) {
+        return true;
+      }
+
+      var helper = TestSupport.createQObjectTestHelper(popup);
+
+      return TestUtils.waitFor(function() { return !getAutofillPopup(); }) &&
+             TestUtils.waitFor(function() { return helper.destroyed; });
+    }
+
+    function waitForAutofillPopup(timeout) {
+      return TestUtils.waitFor(function() {
+          return !!getAutofillPopup() && getAutofillPopup().visible; },
+          timeout);
+    }
+
+    function getSuggestion(index) {
+      return TestSupport.findItemInScene(
+          TestWindow.rootItem, "webView_WebAutofillPopup_item%1".arg(index));
+    }
+
+    function init() {
+      loadForm();
+    }
+
+    // Autofill is not implemented yet for passwords
+    function test_passwords_not_autofilled() {
+      typeStringInField("myuser", "username");
+      keyClick(Qt.Key_Tab);
+      typeStringInField("mypass", "password");
+      keyClick(Qt.Key_Enter);
+      verify(webView.waitForLoadSucceeded());
+
+      loadForm();
+      typeStringInField("my", "username");
+      verify(waitForAutofillPopup());
+      var popup = getAutofillPopup();
+      compare(popup.count, 1);
+      compare(getSuggestion(0).value, "myuser");
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 0);
+      keyClick(Qt.Key_Enter);
+      verify(waitForAutofillPopupToClose());
+      compare_field_value("username", "myuser");
+      compare_field_value("password", "");
+    }
+  }
+}
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_single_fields.html b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_single_fields.html
new file mode 100644
index 0000000..7389fe5
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_single_fields.html
@@ -0,0 +1,11 @@
+<html>
+ <body>
+  <form action="empty.html">
+   <input id="field1" name="field1" type="text" autofocus />
+   <br />
+   <input id="field2" name="field2" type="text" />
+   <br />
+   <input type="submit" value="Submit" />
+  </form>
+ </body>
+</html>
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_single_fields.qml b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_single_fields.qml
new file mode 100644
index 0000000..26a88fb
--- /dev/null
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_single_fields.qml
@@ -0,0 +1,359 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.22
+import Oxide.Ubuntu 1.0
+import Oxide.testsupport 1.0
+import Ubuntu.Components 1.3
+
+FocusScope {
+  id: testRoot
+
+  width: 800
+  height: 600
+
+  focus: true
+
+  UbuntuTestWebView {
+    id: webView
+    objectName: "webView"
+    anchors.fill: parent
+    visible: false
+  }
+
+  UbuntuTestWebView {
+    id: incognitoWebView
+    objectName: "incognitoWebView"
+    anchors.fill: parent
+    incognito: true
+    visible: false
+  }
+
+  Component {
+    id: webViewFactory
+    UbuntuTestWebView {
+      objectName: "webView2"
+      anchors.fill: parent
+    }
+  }
+
+  TestCase {
+    name: "WebViewAutofillPopup_single_fields"
+    when: windowShown
+
+    function loadForm(webView) {
+      webView.visible = true;
+      webView.focus = true;
+      webView.context.autofillEnabled = true;
+      webView.url =
+          "http://testsuite/tst_WebViewAutofillPopup_single_fields.html";
+      verify(webView.waitForLoadSucceeded());
+    }
+
+    function verify_field_focused(webView, field) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.activeElement.id") == field; }));
+    }
+
+    function compare_field_value(webView, field, value) {
+      verify(TestUtils.waitFor(function() {
+          return webView.getTestApi().evaluateCode(
+              "document.querySelector('#%1').value".arg(field)) == value; }));
+    }
+
+    function typeStringInField(webView, string, field) {
+      verify_field_focused(webView, field);
+      for (var i = 0; i < string.length; ++i) {
+        keyClick(string[i]);
+      }
+      compare_field_value(webView, field, string);
+    }
+
+    function initTestCase() {
+      loadForm(webView);
+      // Initial population of the autofill database
+      var data = ["foo", "for", "four"];
+      for (var i = 0; i < data.length; ++i) {
+        webView.url =
+            "http://testsuite/tst_WebViewAutofillPopup_single_fields.html";
+        verify(webView.waitForLoadSucceeded());
+        typeStringInField(webView, data[i], "field1");
+        keyClick(Qt.Key_Enter);
+        verify(webView.waitForLoadSucceeded());
+      }
+    }
+
+    function getAutofillPopup(webView) {
+      return TestSupport.findItemInScene(
+          TestWindow.rootItem, "%1_WebAutofillPopup".arg(webView.objectName));
+    }
+
+    function waitForAutofillPopupToClose(webView) {
+      var popup = getAutofillPopup(webView);
+      if (!popup) {
+        return true;
+      }
+
+      var helper = TestSupport.createQObjectTestHelper(popup);
+
+      return TestUtils.waitFor(function() {
+          return !getAutofillPopup(webView); }) &&
+             TestUtils.waitFor(function() { return helper.destroyed; });
+    }
+
+    function waitForAutofillPopup(webView, timeout) {
+      return TestUtils.waitFor(function() {
+          return !!getAutofillPopup(webView) &&
+                 getAutofillPopup(webView).visible; },
+          timeout);
+    }
+
+    function getSuggestion(webView, index) {
+      return TestSupport.findItemInScene(
+          TestWindow.rootItem,
+          "%1_WebAutofillPopup_item%2".arg(webView.objectName).arg(index));
+    }
+
+    function compareBoundsToClientRect(bounds, rect) {
+      compare(bounds.x, rect.x);
+      compare(bounds.y, rect.y);
+      compare(bounds.width, rect.width);
+      compare(bounds.height, rect.height);
+    }
+
+    function init() {
+      loadForm(webView);
+    }
+
+    function get_webviews_data() {
+      var data = [ { webView: webView } ];
+      if (incognitoWebView.incognito) {
+        // When run in single process mode, incognito cannot be set
+        data.push({ webView: incognitoWebView });
+      }
+      return data;
+    }
+
+    function test_initial_state_data() {
+      return get_webviews_data();
+    }
+
+    function test_initial_state(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      var r =
+          data.webView.getTestApi().getBoundingClientRectForSelector("#field1");
+      compareBoundsToClientRect(popup.elementBounds, r);
+      compare(popup.currentIndex, -1);
+      compare(popup.count, 3);
+      compare(getSuggestion(data.webView, 0).value, "foo");
+      compare(getSuggestion(data.webView, 1).value, "for");
+      compare(getSuggestion(data.webView, 2).value, "four");
+      data.webView.visible = false;
+    }
+
+    function test_destroy_on_webview_close() {
+      var webView2 = webViewFactory.createObject(testRoot);
+      loadForm(webView2);
+      typeStringInField(webView2, "f", "field1");
+
+      verify(TestUtils.waitFor(function() {
+          return !!getAutofillPopup(webView2) &&
+                 getAutofillPopup(webView2).visible; }));
+      var popup = getAutofillPopup(webView2);
+      var helper = TestSupport.createQObjectTestHelper(popup);
+
+      webView2.destroy();
+      verify(TestUtils.waitFor(function() { return helper.destroyed; }));
+    }
+
+    function test_down_arrow_key_navigation_data() {
+      return get_webviews_data();
+    }
+
+    function test_down_arrow_key_navigation(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 0);
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 1);
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 2);
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 0);
+      data.webView.visible = false;
+    }
+
+    function test_up_arrow_key_navigation_data() {
+      return get_webviews_data();
+    }
+
+    function test_up_arrow_key_navigation(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      keyClick(Qt.Key_Up);
+      compare(popup.currentIndex, 2);
+      keyClick(Qt.Key_Up);
+      compare(popup.currentIndex, 1);
+      keyClick(Qt.Key_Up);
+      compare(popup.currentIndex, 0);
+      keyClick(Qt.Key_Up);
+      compare(popup.currentIndex, 2);
+      data.webView.visible = false;
+    }
+
+    function test_escape_dismisses_popup_data() {
+      return get_webviews_data();
+    }
+
+    function test_escape_dismisses_popup(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      keyClick(Qt.Key_Escape);
+      verify(waitForAutofillPopupToClose(data.webView));
+      data.webView.visible = false;
+    }
+
+    function test_escape_dismisses_popup_and_resets_field_value_data() {
+      return get_webviews_data();
+    }
+
+    function test_escape_dismisses_popup_and_resets_field_value(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 0);
+      keyClick(Qt.Key_Escape);
+      verify(waitForAutofillPopupToClose(data.webView));
+      compare_field_value(data.webView, "field1", "f");
+      data.webView.visible = false;
+    }
+
+    function test_validate_suggestion_with_mouse_data() {
+      return get_webviews_data();
+    }
+
+    function test_validate_suggestion_with_mouse(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      var item = getSuggestion(data.webView, 1);
+      mouseClick(item);
+      verify(waitForAutofillPopupToClose(data.webView));
+      verify_field_focused(data.webView, "field1");
+      compare_field_value(data.webView, "field1", "for");
+      data.webView.visible = false;
+    }
+
+    function test_validate_suggestion_with_keyboard_data() {
+      return [
+          { webView: webView, key: Qt.Key_Enter, focus: "field1" },
+          { webView: webView, key: Qt.Key_Return, focus: "field1" },
+          { webView: webView, key: Qt.Key_Tab, focus: "field2" },
+          { webView: incognitoWebView, key: Qt.Key_Enter, focus: "field1" },
+          { webView: incognitoWebView, key: Qt.Key_Return, focus: "field1" },
+          { webView: incognitoWebView, key: Qt.Key_Tab, focus: "field2" },
+      ];
+    }
+
+    function test_validate_suggestion_with_keyboard(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 0);
+      keyClick(data.key);
+      verify(waitForAutofillPopupToClose(data.webView));
+      verify_field_focused(data.webView, data.focus);
+      compare_field_value(data.webView, "field1", "foo");
+      data.webView.visible = false;
+    }
+
+    function test_shiftdel_deletes_suggestion() {
+      typeStringInField(webView, "f", "field1");
+      verify(waitForAutofillPopup(webView));
+      keyClick("l");
+      verify(waitForAutofillPopupToClose(webView));
+      keyClick("i");
+      keyClick("p");
+      compare_field_value(webView, "field1", "flip");
+      keyClick(Qt.Key_Enter);
+      verify(webView.waitForLoadSucceeded());
+      webView.url =
+          "http://testsuite/tst_WebViewAutofillPopup_single_fields.html";
+      verify(webView.waitForLoadSucceeded());
+      typeStringInField(webView, "f", "field1");
+      verify(waitForAutofillPopup(webView));
+      var popup = getAutofillPopup(webView);
+      compare(popup.count, 4);
+      compare(getSuggestion(webView, 0).value, "flip");
+      keyClick(Qt.Key_Down);
+      compare(popup.currentIndex, 0);
+      keyClick(Qt.Key_Delete, Qt.ShiftModifier);
+      tryCompare(popup, "currentIndex", -1);
+      tryCompare(popup, "count", 3);
+    }
+
+    function test_tab_no_suggestion_data() {
+      return get_webviews_data();
+    }
+
+    function test_tab_no_suggestion(data) {
+      loadForm(data.webView);
+      typeStringInField(data.webView, "f", "field1");
+      verify(waitForAutofillPopup(data.webView));
+      var popup = getAutofillPopup(data.webView);
+      compare(popup.currentIndex, -1);
+      verify_field_focused(data.webView, "field1");
+      keyClick(Qt.Key_Tab);
+      verify(waitForAutofillPopupToClose(data.webView));
+      verify_field_focused(data.webView, "field2");
+      data.webView.visible = false;
+    }
+
+    function test_incognito_data_not_saved() {
+      if (!incognitoWebView.incognito) {
+        skip("WebView.incognito cannot be set in single process mode");
+      }
+      loadForm(incognitoWebView);
+      typeStringInField(incognitoWebView, "bar", "field1");
+      keyClick(Qt.Key_Enter);
+      verify(incognitoWebView.waitForLoadSucceeded());
+      loadForm(incognitoWebView);
+      typeStringInField(incognitoWebView, "b", "field1");
+      verify(!waitForAutofillPopup(incognitoWebView, 1000));
+      incognitoWebView.visible = false;
+    }
+
+    function test_zlast_validate_no_suggestion_data() {
+      return [
+          { key: Qt.Key_Enter },
+          { key: Qt.Key_Return },
+      ];
+    }
+
+    // This test needs to be run last as it adds a suggestion that is
+    // not removed afterwards, thus breaking other tests' assumptions
+    function test_zlast_validate_no_suggestion(data) {
+      typeStringInField(webView, "f", "field1");
+      verify(waitForAutofillPopup(webView));
+      var popup = getAutofillPopup(webView);
+      compare(popup.currentIndex, -1);
+      keyClick(data.key);
+      verify(waitForAutofillPopupToClose(webView));
+      verify(webView.waitForLoadSucceeded());
+    }
+  }
+}
diff --git a/qt/uitk/lib/CMakeLists.txt b/qt/uitk/lib/CMakeLists.txt
index 9e76ebe..8f73100 100644
--- a/qt/uitk/lib/CMakeLists.txt
+++ b/qt/uitk/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # vim:expandtab:shiftwidth=2:tabstop=2:
 
-# Copyright (C) 2016 Canonical Ltd.
+# Copyright (C) 2016-2017 Canonical Ltd.
 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -27,6 +27,7 @@ set(OXIDE_UITKLIB_SRCS
     uitk_javascript_dialog.cc
     uitk_touch_editing_menu.cc
     uitk_touch_handle_drawable.cc
+    uitk_web_autofill_popup.cc
     uitk_web_context_menu.cc
     uitk_web_popup_menu.cc)
 
diff --git a/qt/uitk/lib/resources.qrc b/qt/uitk/lib/resources.qrc
index f2cf4ba..83f258a 100644
--- a/qt/uitk/lib/resources.qrc
+++ b/qt/uitk/lib/resources.qrc
@@ -6,6 +6,7 @@
     <file alias="TouchEditingMenu.qml">resources/TouchEditingMenu.qml</file>
     <file alias="[e-mail]">resources/[e-mail]</file>
     <file alias="TouchHandle.qml">resources/TouchHandle.qml</file>
+    <file alias="WebAutofillPopup.qml">resources/WebAutofillPopup.qml</file>
     <file alias="WebContextMenuMobile.qml">resources/WebContextMenuMobile.qml</file>
     <file alias="WebContextMenuDesktop.qml">resources/WebContextMenuDesktop.qml</file>
     <file alias="WebPopupMenu.qml">resources/WebPopupMenu.qml</file>
diff --git a/qt/uitk/lib/resources/WebAutofillPopup.qml b/qt/uitk/lib/resources/WebAutofillPopup.qml
new file mode 100644
index 0000000..848cf0e
--- /dev/null
+++ b/qt/uitk/lib/resources/WebAutofillPopup.qml
@@ -0,0 +1,139 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+FocusScope {
+  objectName: parent && parent.objectName ? parent.objectName + "_WebAutofillPopup" : ""
+
+  property alias model: listview.model
+  property rect elementBounds
+  readonly property int currentIndex: listview.currentIndex
+  readonly property int count: listview.count
+
+  signal close()
+  signal acceptedSuggestion(int index)
+  signal removeSuggestion(int index)
+
+  focus: true
+  clip: true
+
+  x: elementBounds.x
+  y: elementBounds.y + elementBounds.height
+  width: elementBounds.width
+  readonly property real maxHeight: parent ? parent.height - elementBounds.y - elementBounds.height : 0
+  height: Math.min(maxHeight, listview.count * listview.itemHeight)
+
+  Rectangle {
+    anchors.fill: parent
+    color: theme.palette.normal.overlay
+    function newColorWithAlpha(color, alpha) {
+      return Qt.rgba(color.r, color.g, color.b, alpha);
+    }
+    border {
+      width: units.dp(1)
+      color: newColorWithAlpha(theme.palette.normal.base, 0.4)
+    }
+  }
+
+  MouseArea {
+    anchors.fill: parent
+    hoverEnabled: true
+    onPositionChanged: listview.currentIndex = listview.indexAt(mouse.x, mouse.y)
+    onExited: listview.currentIndex = -1
+  }
+
+  ListView {
+    id: listview
+
+    property real itemHeight: 0
+    anchors.fill: parent
+
+    delegate: ListItem {
+      objectName: "%1_item%2".arg(listview.parent.objectName).arg(index)
+      readonly property string value: model.value
+      readonly property string label: model.label
+      height: units.gu(5)
+      ListItemLayout {
+        anchors.verticalCenter: parent.verticalCenter
+        title {
+          text: model.value
+          textSize: Label.Small
+        }
+        subtitle {
+          text: model.label
+          textSize: Label.XSmall
+        }
+      }
+      color: ListView.isCurrentItem ? theme.palette.normal.focus : "transparent"
+      Component.onCompleted: listview.itemHeight = height
+
+      onClicked: acceptedSuggestion(index)
+
+      property bool removalRequested: false
+      Keys.onDeletePressed: {
+        if (event.modifiers & Qt.ShiftModifier) {
+          removalRequested = true;
+          removeSuggestion(index);
+        } else {
+          event.accepted = false;
+        }
+      }
+      ListView.onRemove: {
+        if (removalRequested) {
+          listview.currentIndex = -1;
+        }
+      }
+    }
+
+    Keys.onEnterPressed: {
+      if (currentItem) {
+        currentItem.clicked();
+      } else {
+        event.accepted = false;
+      }
+    }
+    Keys.onReturnPressed: {
+      if (currentItem) {
+        currentItem.clicked();
+      } else {
+        event.accepted = false;
+      }
+    }
+    Keys.onTabPressed: {
+      event.accepted = false;
+      if (currentItem) {
+        currentItem.clicked();
+      }
+    }
+
+    keyNavigationWraps: true
+    currentIndex: -1
+
+    Component.onCompleted: {
+      // Work around the UITK ListViewProxy extension that forces
+      // activeFocusOnTab, thus breaking tab key propagation. Setting
+      // activeFocusOnTab to false needs to be done before the item is the
+      // active focus item.
+      activeFocusOnTab = false;
+      focus = true;
+    }
+  }
+
+  Keys.onEscapePressed: close()
+}
diff --git a/qt/uitk/lib/uitk_auxiliary_ui_factory.cc b/qt/uitk/lib/uitk_auxiliary_ui_factory.cc
index e6f64fb..48731e0 100644
--- a/qt/uitk/lib/uitk_auxiliary_ui_factory.cc
+++ b/qt/uitk/lib/uitk_auxiliary_ui_factory.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2016 Canonical Ltd.
+// Copyright (C) 2016-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,6 +38,7 @@
 #include "uitk_before_unload_dialog.h"
 #include "uitk_javascript_dialog.h"
 #include "uitk_touch_editing_menu.h"
+#include "uitk_web_autofill_popup.h"
 #include "uitk_web_context_menu.h"
 
 static void InitResources() {
@@ -47,11 +48,13 @@ static void InitResources() {
 namespace oxide {
 namespace uitk {
 
+using qt::AutofillSuggestion;
 using qt::EditCapabilityFlags;
 using qt::GetScreenFormFactor;
 using qt::MenuItem;
 using qt::ScreenFormFactor;
 using qt::TouchEditingMenuClient;
+using qt::WebAutofillPopupClient;
 using qt::WebContextMenuAction;
 using qt::WebContextMenuClient;
 using qt::WebContextMenuParams;
@@ -230,6 +233,14 @@ std::unique_ptr<qt::WebContextMenu> AuxiliaryUIFactory::CreateWebContextMenu(
                                 IsItemOnMobileScreen(item_));
 }
 
+std::unique_ptr<qt::WebAutofillPopup>
+AuxiliaryUIFactory::CreateWebAutofillPopup(
+    const std::vector<AutofillSuggestion>& suggestions,
+    const QRectF& bounds,
+    WebAutofillPopupClient* client) {
+  return WebAutofillPopup::Create(item_, suggestions, bounds, client);
+}
+
 std::unique_ptr<qt::TouchEditingMenu>
 AuxiliaryUIFactory::CreateTouchEditingMenu(
     EditCapabilityFlags edit_flags,
diff --git a/qt/uitk/lib/uitk_auxiliary_ui_factory.h b/qt/uitk/lib/uitk_auxiliary_ui_factory.h
index 3d169e4..d0ae8e7 100644
--- a/qt/uitk/lib/uitk_auxiliary_ui_factory.h
+++ b/qt/uitk/lib/uitk_auxiliary_ui_factory.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2016 Canonical Ltd.
+// Copyright (C) 2016-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -56,6 +56,10 @@ class AuxiliaryUIFactory : public qt::AuxiliaryUIFactory {
       const qt::WebContextMenuParams& params,
       const std::vector<qt::MenuItem>& items,
       qt::WebContextMenuClient* client) override;
+  std::unique_ptr<qt::WebAutofillPopup> CreateWebAutofillPopup(
+      const std::vector<qt::AutofillSuggestion>& suggestions,
+      const QRectF& bounds,
+      qt::WebAutofillPopupClient* client) override;
   std::unique_ptr<qt::TouchEditingMenu> CreateTouchEditingMenu(
       qt::EditCapabilityFlags edit_flags,
       qt::TouchEditingMenuClient* client) override;
diff --git a/qt/uitk/lib/uitk_web_autofill_popup.cc b/qt/uitk/lib/uitk_web_autofill_popup.cc
new file mode 100644
index 0000000..4085608
--- /dev/null
+++ b/qt/uitk/lib/uitk_web_autofill_popup.cc
@@ -0,0 +1,297 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "uitk_web_autofill_popup.h"
+
+#include <QAbstractListModel>
+#include <QMetaObject>
+#include <QQmlComponent>
+#include <QQmlEngine>
+#include <QQmlError>
+#include <QQmlProperty>
+#include <QQuickItem>
+#include <QtDebug>
+#include <QVariant>
+#include <QVector>
+
+#include "qt/core/glue/autofill_suggestion.h"
+#include "qt/core/glue/web_autofill_popup_client.h"
+
+namespace oxide {
+namespace uitk {
+
+using qt::AutofillSuggestion;
+
+class WebAutofillPopup::Model : public QAbstractListModel {
+ public:
+  Model(const std::vector<AutofillSuggestion>& suggestions);
+  ~Model() override;
+
+  enum Role {
+    RoleType = Qt::UserRole,
+    RoleValue,
+    RoleLabel,
+    RoleIcon
+  };
+
+  // QAbstractItemModel implementation
+  int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+  QVariant data(const QModelIndex& index,
+                int role = Qt::DisplayRole) const override;
+  QHash<int, QByteArray> roleNames() const override;
+
+ protected:
+  friend class WebAutofillPopup;
+  void updateDataListValues(const std::vector<AutofillSuggestion>& suggestions);
+  void removeSuggestion(int index);
+
+  QVector<AutofillSuggestion> suggestions_;
+};
+
+WebAutofillPopup::Model::Model(
+    const std::vector<AutofillSuggestion>& suggestions) {
+  suggestions_ = QVector<AutofillSuggestion>::fromStdVector(suggestions);
+}
+
+WebAutofillPopup::Model::~Model() = default;
+
+int WebAutofillPopup::Model::rowCount(const QModelIndex& parent) const {
+  return suggestions_.size();
+}
+
+QVariant WebAutofillPopup::Model::data(const QModelIndex& index,
+                                       int role) const {
+  Q_ASSERT(index.isValid());
+  Q_ASSERT(index.row() >= 0 && index.row() < suggestions_.size());
+  Q_ASSERT(index.column() == 0);
+  Q_ASSERT(!index.parent().isValid());
+
+  const AutofillSuggestion& suggestion = suggestions_[index.row()];
+
+  switch (role) {
+    case RoleType: {
+      switch (suggestion.type) {
+        case AutofillSuggestion::Type::ProfileEntry:
+          return QStringLiteral("profile");
+        case AutofillSuggestion::Type::AutoCompleteEntry:
+          return QStringLiteral("autocomplete");
+        case AutofillSuggestion::Type::PasswordEntry:
+          return QStringLiteral("password");
+        case AutofillSuggestion::Type::DataListEntry:
+          return QStringLiteral("datalist");
+        default:
+          Q_UNREACHABLE();
+      }
+    }
+    case RoleValue:
+      return suggestion.value;
+    case RoleLabel:
+      return suggestion.label;
+    case RoleIcon:
+      return suggestion.icon;
+    default:
+      Q_UNREACHABLE();
+  }
+}
+
+QHash<int, QByteArray> WebAutofillPopup::Model::roleNames() const {
+  static QHash<int, QByteArray> roles;
+
+  if (roles.size() > 0) {
+    return roles;
+  }
+
+  roles[RoleType] = "type";
+  roles[RoleValue] = "value";
+  roles[RoleLabel] = "label";
+  roles[RoleIcon] = "icon";
+
+  return roles;
+}
+
+void WebAutofillPopup::Model::updateDataListValues(
+    const std::vector<AutofillSuggestion>& suggestions) {
+  // Remove all the old data list values, which should always be at the top of
+  // the list if they are present.
+  if (!suggestions_.isEmpty()) {
+    int i = suggestions_.size() - 1;
+    while (i >= 0 &&
+           suggestions_[i--].type != AutofillSuggestion::Type::DataListEntry);
+    if (i >= 0) {
+      beginRemoveRows(QModelIndex(), 0, i);
+      suggestions_.remove(0, i + 1);
+      endRemoveRows();
+    }
+  }
+
+  // Prepend the new data list values to the suggestions we already have.
+  beginInsertRows(QModelIndex(), 0, suggestions.size() - 1);
+  suggestions_ =
+      QVector<AutofillSuggestion>::fromStdVector(suggestions) + suggestions_;
+  endInsertRows();
+}
+
+void WebAutofillPopup::Model::removeSuggestion(int index) {
+  beginRemoveRows(QModelIndex(), index, index);
+  suggestions_.remove(index);
+  endRemoveRows();
+}
+
+void WebAutofillPopup::Show() {
+  item_->setVisible(true);
+}
+
+void WebAutofillPopup::UpdateDataListValues(
+    const std::vector<AutofillSuggestion>& suggestions) {
+  model_->updateDataListValues(suggestions);
+}
+
+void WebAutofillPopup::Hide() {
+  item_->setVisible(false);
+}
+
+WebAutofillPopup::WebAutofillPopup(
+    const std::vector<AutofillSuggestion>& suggestions,
+    const QRectF& bounds,
+    qt::WebAutofillPopupClient* client)
+    : model_(new Model(suggestions)),
+      bounds_(bounds),
+      client_(client) {}
+
+bool WebAutofillPopup::Init(QQuickItem* parent) {
+  QQmlEngine* engine = qmlEngine(parent);
+  if (!engine) {
+    qWarning() <<
+        "uitk::WebAutofillPopup: Failed to create autofill popup - "
+        "cannot determine QQmlEngine for parent item";
+    return false;
+  }
+
+  QQmlComponent component(engine);
+  component.loadUrl(QUrl("qrc:///WebAutofillPopup.qml"));
+
+  if (component.isError()) {
+    qCritical() <<
+        "uitk::WebAutofillPopup: Failed to initialize autofill popup component "
+        "because of the following errors: ";
+    for (const auto& error : component.errors()) {
+      qCritical() << error;
+    }
+    return false;
+  }
+
+  Q_ASSERT(component.isReady());
+
+  QObject* popup = component.beginCreate(engine->rootContext());
+  if (!popup) {
+    qCritical() <<
+        "uitk::WebAutofillPopup: Failed to create autofill popup instance";
+    return false;
+  }
+
+  item_.reset(qobject_cast<QQuickItem*>(popup));
+  if (!item_) {
+    qCritical() <<
+        "uitk::WebAutofillPopup: Autofill popup instance is not a QQuickItem";
+    delete popup;
+    return false;
+  }
+
+  item_->setProperty("model", QVariant::fromValue(model_.get()));
+  item_->setProperty("elementBounds", bounds_);
+  item_->setParentItem(parent);
+
+  component.completeCreate();
+
+  connect(item_.get(), SIGNAL(close()), this, SLOT(OnCloseRequested()));
+  connect(item_.get(), SIGNAL(currentIndexChanged()),
+          this, SLOT(OnSuggestionSelected()));
+  connect(item_.get(), SIGNAL(acceptedSuggestion(int)),
+          this, SLOT(OnSuggestionAccepted(int)));
+  connect(item_.get(), SIGNAL(removeSuggestion(int)),
+          this, SLOT(OnSuggestionRemovalRequested(int)));
+
+  return true;
+}
+
+void WebAutofillPopup::OnCloseRequested() {
+  client_->Close();
+}
+
+void WebAutofillPopup::OnSuggestionSelected() {
+  int index =
+      QQmlProperty(item_.get(), QStringLiteral("currentIndex")).read().toInt();
+
+  if (index == -1) {
+    client_->ClearSelection();
+    return;
+  }
+
+  if (index < 0 || index >= model_->rowCount()) {
+    qWarning() << "uitk::WebAutofillPopup: invalid index";
+    return;
+  }
+
+  const AutofillSuggestion& suggestion = model_->suggestions_[index];
+  client_->SelectSuggestion(suggestion);
+}
+
+void WebAutofillPopup::OnSuggestionAccepted(int index) {
+  if (index < 0 || index >= model_->rowCount()) {
+    qWarning() << "uitk::WebAutofillPopup: invalid index";
+    return;
+  }
+
+  const AutofillSuggestion& suggestion = model_->suggestions_[index];
+  client_->AcceptSuggestion(suggestion);
+}
+
+void WebAutofillPopup::OnSuggestionRemovalRequested(int index) {
+  if (index < 0 || index >= model_->rowCount()) {
+    qWarning() << "uitk::WebAutofillPopup: invalid index";
+    return;
+  }
+
+  const AutofillSuggestion& suggestion = model_->suggestions_[index];
+  if (client_->RemoveSuggestion(suggestion)) {
+    model_->removeSuggestion(index);
+  }
+}
+
+// static
+std::unique_ptr<WebAutofillPopup> WebAutofillPopup::Create(
+    QQuickItem* parent,
+    const std::vector<AutofillSuggestion>& suggestions,
+    const QRectF& bounds,
+    qt::WebAutofillPopupClient* client) {
+  if (suggestions.empty()) {
+    return nullptr;
+  }
+
+  std::unique_ptr<WebAutofillPopup> popup(
+      new WebAutofillPopup(suggestions, bounds, client));
+  if (!popup->Init(parent)) {
+    return nullptr;
+  }
+
+  return std::move(popup);
+}
+
+WebAutofillPopup::~WebAutofillPopup() = default;
+
+} // namespace uitk
+} // namespace oxide
diff --git a/qt/uitk/lib/uitk_web_autofill_popup.h b/qt/uitk/lib/uitk_web_autofill_popup.h
new file mode 100644
index 0000000..4dfbf38
--- /dev/null
+++ b/qt/uitk/lib/uitk_web_autofill_popup.h
@@ -0,0 +1,87 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_UITK_LIB_WEB_AUTOFILL_POPUP_H_
+#define _OXIDE_UITK_LIB_WEB_AUTOFILL_POPUP_H_
+
+#include "qt/core/glue/web_autofill_popup.h"
+
+#include <memory>
+#include <vector>
+
+#include <QObject>
+#include <QRectF>
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+class QQuickItem;
+QT_END_NAMESPACE
+
+namespace oxide {
+
+namespace qt {
+struct AutofillSuggestion;
+class WebAutofillPopupClient;
+}
+
+namespace uitk {
+
+class WebAutofillPopup : public QObject,
+                         public qt::WebAutofillPopup {
+  Q_OBJECT
+  Q_DISABLE_COPY(WebAutofillPopup)
+
+ public:
+  static std::unique_ptr<WebAutofillPopup> Create(
+      QQuickItem* parent,
+      const std::vector<qt::AutofillSuggestion>& suggestions,
+      const QRectF& bounds,
+      qt::WebAutofillPopupClient* client);
+  ~WebAutofillPopup() override;
+
+ private Q_SLOTS:
+  void OnCloseRequested();
+  void OnSuggestionSelected();
+  void OnSuggestionAccepted(int index);
+  void OnSuggestionRemovalRequested(int index);
+
+ private:
+  WebAutofillPopup(const std::vector<qt::AutofillSuggestion>& suggestions,
+                   const QRectF& bounds,
+                   qt::WebAutofillPopupClient* client);
+  bool Init(QQuickItem* parent);
+
+  // qt::WebAutofillPopup implementation
+  void Show() override;
+  void UpdateDataListValues(
+      const std::vector<qt::AutofillSuggestion>& suggestions) override;
+  void Hide() override;
+
+  class Model;
+  std::unique_ptr<Model> model_;
+
+  QRectF bounds_;
+
+  qt::WebAutofillPopupClient* client_;
+
+  std::unique_ptr<QQuickItem> item_;
+};
+
+} // namespace uitk
+} // namespace oxide
+
+#endif // _OXIDE_UITK_LIB_WEB_AUTOFILL_POPUP_H_
diff --git a/shared/BUILD.gn b/shared/BUILD.gn
index 77eaeca..1aaf81d 100644
--- a/shared/BUILD.gn
+++ b/shared/BUILD.gn
@@ -1,6 +1,6 @@
 # vim:expandtab:shiftwidth=2:tabstop=2:
 
-# Copyright (C) 2016 Canonical Ltd.
+# Copyright (C) 2016-2017 Canonical Ltd.
 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -113,6 +113,7 @@ repack_locales("shared_repack_locales") {
   output_locales = locales
 
   source_patterns = [
+    "${root_gen_dir}/components/strings/components_strings_",
     "${root_gen_dir}/content/app/strings/content_strings_",
     "${root_gen_dir}/ui/strings/app_locale_settings_",
   ]
@@ -120,6 +121,7 @@ repack_locales("shared_repack_locales") {
   output_dir = "${root_out_dir}/chromium_l10n"
 
   deps = [
+    "//components/strings",
     "//content/app/strings",
     "//ui/strings:app_locale_settings",
   ]
@@ -180,13 +182,23 @@ component("shared") {
     "//base:i18n",
     "//cc",
     "//cc/surfaces",
+    "//components/autofill/content/browser",
+    "//components/autofill/content/renderer",
+    "//components/autofill/core/browser",
     "//components/keyed_service/content",
     "//components/keyed_service/core",
+    "//components/password_manager/content/browser",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/sync",
+    "//components/user_prefs",
     "//components/sessions",
+    "//components/webdata/common",
     "//content/public/app:both",
     "//content/public/browser",
     "//content/public/child",
     "//content/public/common",
+    "//content/public/common:service_names",
     "//content/public/gpu",
     "//content/public/renderer",
     "//content/public/utility",
@@ -198,6 +210,7 @@ component("shared") {
     "//device/vibration:mojo_bindings",
     "//extensions/common",
     "//gin",
+    "//google_apis",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/common",
     "//gpu/command_buffer/service",
@@ -244,6 +257,12 @@ component("shared") {
     "app/oxide_main.cc",
     "app/oxide_main.h",
     "app/oxide_platform_delegate.h",
+    "browser/autofill/autofill_client.cc",
+    "browser/autofill/autofill_client.h",
+    "browser/autofill/autofill_popup_controller.cc",
+    "browser/autofill/autofill_popup_controller.h",
+    "browser/autofill/web_autofill_popup.h",
+    "browser/autofill/web_autofill_popup_client.h",
     "browser/browser_object_weak_ptrs.h",
     "browser/chrome_controller.cc",
     "browser/chrome_controller.h",
@@ -299,6 +318,8 @@ component("shared") {
     "browser/device/power_save_blocker.h",
     "browser/device/power_save_blocker_linux.cc",
     "browser/display_form_factor.h",
+    "browser/filtered_pref_store.cc",
+    "browser/filtered_pref_store.h",
     "browser/input/input_method_context.h",
     "browser/input/input_method_context_client.cc",
     "browser/input/input_method_context_client.h",
@@ -454,6 +475,8 @@ component("shared") {
     "browser/permissions/oxide_permission_request_response.h",
     "browser/permissions/oxide_temporary_saved_permission_context.cc",
     "browser/permissions/oxide_temporary_saved_permission_context.h",
+    "browser/personal_data_manager_factory.cc",
+    "browser/personal_data_manager_factory.h",
     "browser/screen.cc",
     "browser/screen.h",
     "browser/screen_observer.cc",
@@ -487,6 +510,10 @@ component("shared") {
     "browser/web_contents_data_tracker.h",
     "browser/web_contents_helper.cc",
     "browser/web_contents_helper.h",
+    "browser/web_data_service_factory.cc",
+    "browser/web_data_service_factory.h",
+    "browser/web_data_service_wrapper.cc",
+    "browser/web_data_service_wrapper.h",
     "browser/web_popup_menu.h",
     "browser/web_popup_menu_client.h",
     "browser/web_popup_menu_host.cc",
@@ -714,6 +741,7 @@ test_executable("shared_unittests") {
     "//base",
     "//base/test:test_support",
     "//cc",
+    "//components/prefs:test_support",
     "//content/public/browser",
     "//content/public/common",
     "//content/test:test_support",
@@ -729,6 +757,7 @@ test_executable("shared_unittests") {
   ]
 
   sources = [
+    "browser/filtered_pref_store_unittest.cc",
     "browser/javascript_dialogs/javascript_dialog_contents_helper_unittest.cc",
     "browser/javascript_dialogs/javascript_dialog_host_unittest.cc",
     "browser/javascript_dialogs/javascript_dialog_testing_utils.cc",
diff --git a/shared/browser/autofill/autofill_client.cc b/shared/browser/autofill/autofill_client.cc
new file mode 100644
index 0000000..bbf22ee
--- /dev/null
+++ b/shared/browser/autofill/autofill_client.cc
@@ -0,0 +1,272 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2016-2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "autofill_client.h"
+
+#include "base/logging.h"
+#include "components/autofill/content/browser/content_autofill_driver.h"
+#include "components/autofill/content/browser/content_autofill_driver_factory.h"
+#include "components/autofill/core/common/autofill_pref_names.h"
+#include "components/prefs/pref_service.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/ssl_status.h"
+#include "google_apis/gaia/identity_provider.h"
+
+#include "shared/browser/oxide_browser_context.h"
+#include "shared/browser/personal_data_manager_factory.h"
+#include "shared/browser/web_data_service_factory.h"
+
+#include "autofill_popup_controller.h"
+
+namespace oxide {
+
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(oxide::AutofillClient);
+
+class DummyIdentityProvider : public IdentityProvider {
+ public:
+  explicit DummyIdentityProvider();
+  ~DummyIdentityProvider() override;
+
+  std::string GetActiveUsername() override;
+  std::string GetActiveAccountId() override;
+  OAuth2TokenService* GetTokenService() override;
+  bool RequestLogin() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DummyIdentityProvider);
+};
+
+DummyIdentityProvider::DummyIdentityProvider() {}
+
+DummyIdentityProvider::~DummyIdentityProvider() {}
+
+std::string DummyIdentityProvider::GetActiveUsername() {
+  return std::string();
+}
+
+std::string DummyIdentityProvider::GetActiveAccountId() {
+  return std::string();
+}
+
+OAuth2TokenService* DummyIdentityProvider::GetTokenService() {
+  return nullptr;
+}
+
+bool DummyIdentityProvider::RequestLogin() {
+  return false;
+}
+
+AutofillClient::AutofillClient(content::WebContents* web_contents)
+    : content::WebContentsObserver(web_contents) {
+  DCHECK(web_contents);
+}
+
+AutofillClient::~AutofillClient() {
+  DCHECK(!popup_controller_);
+}
+
+void AutofillClient::DidHideAutofillPopup() {
+  DCHECK(popup_controller_);
+
+  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
+                                                  popup_controller_.release());
+}
+
+autofill::PersonalDataManager* AutofillClient::GetPersonalDataManager() {
+  return PersonalDataManagerFactory::GetForContext(
+      web_contents()->GetBrowserContext());
+}
+
+scoped_refptr<autofill::AutofillWebDataService>
+AutofillClient::GetDatabase() {
+  return WebDataServiceFactory::GetAutofillWebDataForContext(
+      web_contents()->GetBrowserContext());
+}
+
+PrefService* AutofillClient::GetPrefs() {
+  return BrowserContext::FromContent(web_contents()->GetBrowserContext())
+      ->GetPrefs();
+}
+
+syncer::SyncService* AutofillClient::GetSyncService() {
+  return nullptr;
+}
+
+IdentityProvider* AutofillClient::GetIdentityProvider() {
+  if (!identity_provider_) {
+    identity_provider_.reset(new DummyIdentityProvider());
+  }
+
+  return identity_provider_.get();
+}
+
+rappor::RapporServiceImpl* AutofillClient::GetRapporServiceImpl() {
+  return nullptr;
+}
+
+ukm::UkmService* AutofillClient::GetUkmService() {
+  return nullptr;
+}
+
+void AutofillClient::ShowAutofillSettings() {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::ShowUnmaskPrompt(
+    const autofill::CreditCard& card,
+    UnmaskCardReason reason,
+    base::WeakPtr<autofill::CardUnmaskDelegate> delegate) {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::OnUnmaskVerificationResult(
+    PaymentsRpcResult result) {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::ConfirmSaveCreditCardLocally(
+    const autofill::CreditCard& card,
+    const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::ConfirmSaveCreditCardToCloud(
+    const autofill::CreditCard& card,
+    std::unique_ptr<base::DictionaryValue> legal_message,
+    const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::ConfirmCreditCardFillAssist(
+    const autofill::CreditCard& card,
+    const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::LoadRiskData(
+    const base::Callback<void(const std::string&)>& callback) {
+  NOTIMPLEMENTED();
+}
+
+bool AutofillClient::HasCreditCardScanFeature() {
+  return false;
+}
+
+void AutofillClient::ScanCreditCard(
+    const CreditCardScanCallback& callback) {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::ShowAutofillPopup(
+    const gfx::RectF& element_bounds,
+    base::i18n::TextDirection text_direction,
+    const std::vector<autofill::Suggestion>& suggestions,
+    base::WeakPtr<autofill::AutofillPopupDelegate> delegate) {
+  // Will delete or reuse the old |popup_controller_|.
+  popup_controller_.reset(
+      AutofillPopupController::GetOrCreate(
+          popup_controller_, delegate, web_contents(), element_bounds,
+          text_direction, base::Bind(&AutofillClient::DidHideAutofillPopup,
+                                     base::Unretained(this))));
+
+  popup_controller_->Show(suggestions);
+}
+
+void AutofillClient::UpdateAutofillPopupDataListValues(
+    const std::vector<base::string16>& values,
+    const std::vector<base::string16>& labels) {
+  if (popup_controller_.get()) {
+    popup_controller_->UpdateDataListValues(values, labels);
+  }
+}
+
+void AutofillClient::HideAutofillPopup() {
+  if (popup_controller_.get()) {
+    popup_controller_->Hide();
+  }
+}
+
+bool AutofillClient::IsAutocompleteEnabled() {
+  return GetPrefs()->GetBoolean(autofill::prefs::kAutofillEnabled);
+}
+
+void AutofillClient::MainFrameWasResized(bool width_changed) {
+  HideAutofillPopup();
+}
+
+void AutofillClient::WebContentsDestroyed() {
+  HideAutofillPopup();
+}
+
+void AutofillClient::PropagateAutofillPredictions(
+    content::RenderFrameHost* rfh,
+    const std::vector<autofill::FormStructure*>& forms) {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::DidFillOrPreviewField(
+    const base::string16& autofilled_value,
+    const base::string16& profile_full_name) {}
+
+void AutofillClient::OnFirstUserGestureObserved() {
+  autofill::ContentAutofillDriverFactory* factory =
+      autofill::ContentAutofillDriverFactory::FromWebContents(web_contents());
+  DCHECK(factory);
+
+  for (content::RenderFrameHost* frame : web_contents()->GetAllFrames()) {
+    if (!frame->IsRenderFrameLive()) {
+      continue;
+    }
+    autofill::ContentAutofillDriver* driver = factory->DriverForFrame(frame);
+    DCHECK(driver);
+    driver->NotifyFirstUserGestureObservedInTab();
+  }
+}
+
+bool AutofillClient::IsContextSecure() {
+  content::SSLStatus ssl_status;
+  content::NavigationEntry* navigation_entry =
+      web_contents()->GetController().GetLastCommittedEntry();
+  if (!navigation_entry) {
+    return false;
+  }
+
+  ssl_status = navigation_entry->GetSSL();
+  return navigation_entry->GetURL().SchemeIsCryptographic() &&
+         ssl_status.certificate &&
+         (!net::IsCertStatusError(ssl_status.cert_status) ||
+          net::IsCertStatusMinorError(ssl_status.cert_status)) &&
+         !(ssl_status.content_status &
+           content::SSLStatus::RAN_INSECURE_CONTENT);
+}
+
+bool AutofillClient::ShouldShowSigninPromo() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+void AutofillClient::StartSigninFlow() {
+  NOTIMPLEMENTED();
+}
+
+void AutofillClient::ShowHttpNotSecureExplanation() {
+  NOTIMPLEMENTED();
+}
+
+} // namespace oxide
diff --git a/shared/browser/autofill/autofill_client.h b/shared/browser/autofill/autofill_client.h
new file mode 100644
index 0000000..b31fe3c
--- /dev/null
+++ b/shared/browser/autofill/autofill_client.h
@@ -0,0 +1,116 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2016-2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_AUTOFILL_AUTOFILL_CLIENT_H_
+#define _OXIDE_SHARED_BROWSER_AUTOFILL_AUTOFILL_CLIENT_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "base/callback.h"
+#include "base/compiler_specific.h"
+#include "base/i18n/rtl.h"
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "components/autofill/core/browser/autofill_client.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/browser/web_contents_user_data.h"
+
+namespace content {
+class WebContents;
+}
+
+namespace oxide {
+
+class AutofillPopupController;
+class DummyIdentityProvider;
+
+class AutofillClient
+    : public autofill::AutofillClient,
+      public content::WebContentsUserData<AutofillClient>,
+      public content::WebContentsObserver {
+ public:
+  ~AutofillClient() override;
+
+  // AutofillClient:
+  autofill::PersonalDataManager* GetPersonalDataManager() override;
+  scoped_refptr<autofill::AutofillWebDataService> GetDatabase() override;
+  PrefService* GetPrefs() override;
+  syncer::SyncService* GetSyncService() override;
+  IdentityProvider* GetIdentityProvider() override;
+  rappor::RapporServiceImpl* GetRapporServiceImpl() override;
+  ukm::UkmService* GetUkmService() override;
+  void ShowAutofillSettings() override;
+  void ShowUnmaskPrompt(
+      const autofill::CreditCard& card,
+      UnmaskCardReason reason,
+      base::WeakPtr<autofill::CardUnmaskDelegate> delegate) override;
+  void OnUnmaskVerificationResult(PaymentsRpcResult result) override;
+  void ConfirmSaveCreditCardLocally(const autofill::CreditCard& card,
+                                    const base::Closure& callback) override;
+  void ConfirmSaveCreditCardToCloud(
+      const autofill::CreditCard& card,
+      std::unique_ptr<base::DictionaryValue> legal_message,
+      const base::Closure& callback) override;
+  void ConfirmCreditCardFillAssist(const autofill::CreditCard& card,
+                                   const base::Closure& callback) override;
+  void LoadRiskData(
+      const base::Callback<void(const std::string&)>& callback) override;
+  bool HasCreditCardScanFeature() override;
+  void ScanCreditCard(const CreditCardScanCallback& callback) override;
+  void ShowAutofillPopup(
+      const gfx::RectF& element_bounds,
+      base::i18n::TextDirection text_direction,
+      const std::vector<autofill::Suggestion>& suggestions,
+      base::WeakPtr<autofill::AutofillPopupDelegate> delegate) override;
+  void UpdateAutofillPopupDataListValues(
+      const std::vector<base::string16>& values,
+      const std::vector<base::string16>& labels) override;
+  void HideAutofillPopup() override;
+  bool IsAutocompleteEnabled() override;
+  void PropagateAutofillPredictions(
+      content::RenderFrameHost* rfh,
+      const std::vector<autofill::FormStructure*>& forms) override;
+  void DidFillOrPreviewField(const base::string16& autofilled_value,
+                             const base::string16& profile_full_name) override;
+  void OnFirstUserGestureObserved() override;
+  bool IsContextSecure() override;
+  bool ShouldShowSigninPromo() override;
+  void StartSigninFlow() override;
+  void ShowHttpNotSecureExplanation() override;
+
+  // content::WebContentsObserver implementation.
+  void MainFrameWasResized(bool width_changed) override;
+  void WebContentsDestroyed() override;
+
+ private:
+  explicit AutofillClient(content::WebContents* web_contents);
+  friend class content::WebContentsUserData<AutofillClient>;
+
+  void DidHideAutofillPopup();
+
+  std::unique_ptr<AutofillPopupController> popup_controller_;
+
+  std::unique_ptr<DummyIdentityProvider> identity_provider_;
+
+  DISALLOW_COPY_AND_ASSIGN(AutofillClient);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_AUTOFILL_AUTOFILL_CLIENT_H_
diff --git a/shared/browser/autofill/autofill_popup_controller.cc b/shared/browser/autofill/autofill_popup_controller.cc
new file mode 100644
index 0000000..a79fe61
--- /dev/null
+++ b/shared/browser/autofill/autofill_popup_controller.cc
@@ -0,0 +1,163 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "autofill_popup_controller.h"
+
+#include "components/autofill/core/browser/autofill_popup_delegate.h"
+#include "components/autofill/core/browser/suggestion.h"
+
+#include "shared/browser/chrome_controller.h"
+#include "shared/browser/oxide_web_contents_view.h"
+#include "shared/browser/oxide_web_contents_view_client.h"
+#include "shared/browser/web_contents_client.h"
+#include "shared/browser/web_contents_helper.h"
+
+#include "web_autofill_popup.h"
+
+namespace oxide {
+
+// static
+AutofillPopupController* AutofillPopupController::GetOrCreate(
+    std::unique_ptr<AutofillPopupController>& previous,
+    base::WeakPtr<autofill::AutofillPopupDelegate> delegate,
+    content::WebContents* web_contents,
+    const gfx::RectF& element_bounds,
+    base::i18n::TextDirection text_direction,
+    const base::Closure& hidden_callback) {
+  if (previous.get() && previous->web_contents_ == web_contents &&
+      previous->delegate_.get() == delegate.get() &&
+      previous->element_bounds_ == element_bounds) {
+    previous->ClearState();
+    return previous.release();
+  }
+
+  if (previous.get()) {
+    previous->Hide();
+  }
+
+  return new AutofillPopupController(
+      delegate, web_contents, element_bounds, text_direction, hidden_callback);
+}
+
+AutofillPopupController::AutofillPopupController(
+    base::WeakPtr<autofill::AutofillPopupDelegate> delegate,
+    content::WebContents* web_contents,
+    const gfx::RectF& element_bounds,
+    base::i18n::TextDirection text_direction,
+    const base::Closure& hidden_callback)
+    : web_contents_(web_contents),
+      element_bounds_(element_bounds),
+      delegate_(delegate),
+      hidden_callback_(hidden_callback) {
+  ClearState();
+}
+
+AutofillPopupController::~AutofillPopupController() {
+  hidden_callback_.Reset();
+}
+
+void AutofillPopupController::Show(
+    const std::vector<autofill::Suggestion>& suggestions) {
+  suggestions_ = suggestions;
+
+  WebContentsHelper* helper =
+      WebContentsHelper::FromWebContents(web_contents_);
+  if (!helper->client()) {
+    return;
+  }
+
+  gfx::Vector2d top_content_offset;
+  ChromeController* chrome_controller =
+      ChromeController::FromWebContents(web_contents_);
+  if (chrome_controller) {
+    top_content_offset =
+        gfx::Vector2d(0, chrome_controller->GetTopContentOffset());
+  }
+
+  popup_ = helper->client()->CreateAutofillPopup(
+      suggestions, element_bounds_ + top_content_offset, this);
+  if (!popup_) {
+    return;
+  }
+
+  popup_->Show();
+
+  delegate_->OnPopupShown();
+}
+
+void AutofillPopupController::UpdateDataListValues(
+    const std::vector<base::string16>& values,
+    const std::vector<base::string16>& labels) {
+  if (popup_) {
+    popup_->UpdateDataListValues(values, labels);
+  }
+}
+
+void AutofillPopupController::Hide() {
+  if (hidden_callback_.is_null()) {
+    return;
+  }
+  base::Closure hidden_callback = std::move(hidden_callback_);
+  hidden_callback_.Reset();
+
+  if (delegate_) {
+    delegate_->OnPopupHidden();
+  }
+
+  if (popup_) {
+    popup_->Hide();
+  }
+
+  hidden_callback.Run();
+}
+
+void AutofillPopupController::Close() {
+  Hide();
+}
+
+void AutofillPopupController::SelectSuggestion(int frontend_id,
+                                               const base::string16& value) {
+  delegate_->DidSelectSuggestion(value, frontend_id);
+}
+
+void AutofillPopupController::ClearSelection() {
+  delegate_->ClearPreviewedForm();
+}
+
+void AutofillPopupController::AcceptSuggestion(int frontend_id,
+                                               const base::string16& value) {
+  int position = 0;
+  for (size_t i = 0; i < suggestions_.size(); ++i) {
+    const autofill::Suggestion& suggestion = suggestions_[i];
+    if (suggestion.frontend_id == frontend_id && suggestion.value == value) {
+      position = i;
+      break;
+    }
+  }
+  delegate_->DidAcceptSuggestion(value, frontend_id, position);
+}
+
+bool AutofillPopupController::RemoveSuggestion(int frontend_id,
+                                               const base::string16& value) {
+  return delegate_->RemoveSuggestion(value, frontend_id);
+}
+
+void AutofillPopupController::ClearState() {
+  suggestions_.clear();
+}
+
+} // namespace oxide
diff --git a/shared/browser/autofill/autofill_popup_controller.h b/shared/browser/autofill/autofill_popup_controller.h
new file mode 100644
index 0000000..e7d9be0
--- /dev/null
+++ b/shared/browser/autofill/autofill_popup_controller.h
@@ -0,0 +1,92 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_H_
+#define _OXIDE_SHARED_BROWSER_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_H_
+
+#include <vector>
+
+#include "base/callback.h"
+#include "base/i18n/rtl.h"
+#include "base/memory/weak_ptr.h"
+#include "base/strings/string16.h"
+#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/native_widget_types.h"
+
+#include "web_autofill_popup_client.h"
+
+namespace autofill {
+class AutofillPopupDelegate;
+struct Suggestion;
+}
+
+namespace content {
+class WebContents;
+}
+
+namespace oxide {
+
+class WebAutofillPopup;
+
+class AutofillPopupController : public WebAutofillPopupClient {
+ public:
+  ~AutofillPopupController();
+
+  static AutofillPopupController* GetOrCreate(
+      std::unique_ptr<AutofillPopupController>& previous,
+      base::WeakPtr<autofill::AutofillPopupDelegate> delegate,
+      content::WebContents* web_contents,
+      const gfx::RectF& element_bounds,
+      base::i18n::TextDirection text_direction,
+      const base::Closure& hidden_callback);
+
+  void Show(const std::vector<autofill::Suggestion>& suggestions);
+  void UpdateDataListValues(const std::vector<base::string16>& values,
+                            const std::vector<base::string16>& labels);
+  void Hide();
+
+ private:
+  AutofillPopupController(
+      base::WeakPtr<autofill::AutofillPopupDelegate> delegate,
+      content::WebContents* web_contents,
+      const gfx::RectF& element_bounds,
+      base::i18n::TextDirection text_direction,
+      const base::Closure& hidden_callback);
+
+  void ClearState();
+
+  // WebAutofillPopupClient implementation
+  void Close() override;
+  void SelectSuggestion(int frontend_id, const base::string16& value) override;
+  void ClearSelection() override;
+  void AcceptSuggestion(int frontend_id, const base::string16& value) override;
+  bool RemoveSuggestion(int frontend_id, const base::string16& value) override;
+
+  content::WebContents* web_contents_;
+  gfx::RectF element_bounds_;
+  base::WeakPtr<autofill::AutofillPopupDelegate> delegate_;
+  base::i18n::TextDirection text_direction_;
+  std::vector<autofill::Suggestion> suggestions_;
+
+  std::unique_ptr<WebAutofillPopup> popup_;
+
+  base::Closure hidden_callback_;
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_H_
diff --git a/shared/browser/autofill/web_autofill_popup.h b/shared/browser/autofill/web_autofill_popup.h
new file mode 100644
index 0000000..7d58fdc
--- /dev/null
+++ b/shared/browser/autofill/web_autofill_popup.h
@@ -0,0 +1,42 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_WEB_AUTOFILL_POPUP_H_
+#define _OXIDE_SHARED_BROWSER_WEB_AUTOFILL_POPUP_H_
+
+#include <vector>
+
+#include "base/strings/string16.h"
+
+namespace oxide {
+
+class WebAutofillPopup {
+ public:
+  virtual ~WebAutofillPopup() {}
+
+  virtual void Show() = 0;
+
+  virtual void UpdateDataListValues(
+      const std::vector<base::string16>& values,
+      const std::vector<base::string16>& labels) = 0;
+
+  virtual void Hide() = 0;
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_WEB_AUTOFILL_POPUP_H_
diff --git a/shared/browser/autofill/web_autofill_popup_client.h b/shared/browser/autofill/web_autofill_popup_client.h
new file mode 100644
index 0000000..4eecc06
--- /dev/null
+++ b/shared/browser/autofill/web_autofill_popup_client.h
@@ -0,0 +1,41 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_AUTOFILL_WEB_AUTOFILL_POPUP_CLIENT_H_
+#define _OXIDE_SHARED_BROWSER_AUTOFILL_WEB_AUTOFILL_POPUP_CLIENT_H_
+
+#include "base/strings/string16.h"
+
+namespace oxide {
+
+class WebAutofillPopupClient {
+ public:
+  virtual ~WebAutofillPopupClient() {}
+
+  virtual void Close() = 0;
+  virtual void SelectSuggestion(int frontend_id,
+                                const base::string16& value) = 0;
+  virtual void ClearSelection() = 0;
+  virtual void AcceptSuggestion(int frontend_id,
+                                const base::string16& value) = 0;
+  virtual bool RemoveSuggestion(int frontend_id,
+                                const base::string16& value) = 0;
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_AUTOFILL_WEB_AUTOFILL_POPUP_CLIENT_H_
diff --git a/shared/browser/filtered_pref_store.cc b/shared/browser/filtered_pref_store.cc
new file mode 100644
index 0000000..bfc7931
--- /dev/null
+++ b/shared/browser/filtered_pref_store.cc
@@ -0,0 +1,181 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "filtered_pref_store.h"
+
+#include "base/stl_util.h"
+#include "base/values.h"
+#include "components/prefs/in_memory_pref_store.h"
+#include "components/prefs/json_pref_store.h"
+
+namespace oxide {
+
+FilteredPrefStore::AggregatingObserver::AggregatingObserver(
+    FilteredPrefStore* outer)
+    : outer_(outer) {}
+
+void FilteredPrefStore::AggregatingObserver::OnPrefValueChanged(
+    const std::string& key) {
+  if (!outer_->IsInitializationComplete()) {
+    return;
+  }
+
+  for (auto& observer : outer_->observers_) {
+    observer.OnPrefValueChanged(key);
+  }
+}
+
+void FilteredPrefStore::AggregatingObserver::OnInitializationCompleted(
+    bool succeeded) {
+  // This always comes the persistent pref store. In-memory pref stores don't
+  // notify observers of their initialization status.
+  if (succeeded && outer_->read_error_delegate_) {
+    PersistentPrefStore::PrefReadError read_error = outer_->GetReadError();
+    if (read_error != PersistentPrefStore::PREF_READ_ERROR_NONE)
+      outer_->read_error_delegate_->OnError(read_error);
+  }
+
+  for (auto& observer : outer_->observers_) {
+    observer.OnInitializationCompleted(true);
+  }
+}
+
+FilteredPrefStore::FilteredPrefStore(
+    const scoped_refptr<InMemoryPrefStore>& volatile_pref_store,
+    const scoped_refptr<JsonPrefStore>& persistent_pref_store,
+    const std::set<std::string>& persistent_pref_names)
+    : volatile_pref_store_(volatile_pref_store),
+      persistent_pref_store_(persistent_pref_store),
+      persistent_preference_names_(persistent_pref_names),
+      aggregating_observer_(this) {
+  volatile_pref_store_->AddObserver(&aggregating_observer_);
+  persistent_pref_store_->AddObserver(&aggregating_observer_);
+}
+
+void FilteredPrefStore::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void FilteredPrefStore::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+bool FilteredPrefStore::HasObservers() const {
+  return observers_.might_have_observers();
+}
+
+bool FilteredPrefStore::IsInitializationComplete() const {
+  return persistent_pref_store_->IsInitializationComplete();
+}
+
+bool FilteredPrefStore::GetValue(const std::string& key,
+                                   const base::Value** result) const {
+  return StoreForKey(key)->GetValue(key, result);
+}
+
+std::unique_ptr<base::DictionaryValue> FilteredPrefStore::GetValues() const {
+  auto values = volatile_pref_store_->GetValues();
+  auto persistent_pref_store_values = persistent_pref_store_->GetValues();
+  for (const auto& key : persistent_preference_names_) {
+    const base::Value* value = nullptr;
+    if (persistent_pref_store_values->Get(key, &value)) {
+      values->Set(key, value->CreateDeepCopy());
+    } else {
+      values->Remove(key, nullptr);
+    }
+  }
+  return values;
+}
+
+void FilteredPrefStore::SetValue(const std::string& key,
+                                   std::unique_ptr<base::Value> value,
+                                   uint32_t flags) {
+  StoreForKey(key)->SetValue(key, std::move(value), flags);
+}
+
+void FilteredPrefStore::RemoveValue(const std::string& key, uint32_t flags) {
+  StoreForKey(key)->RemoveValue(key, flags);
+}
+
+bool FilteredPrefStore::GetMutableValue(const std::string& key,
+                                          base::Value** result) {
+  return StoreForKey(key)->GetMutableValue(key, result);
+}
+
+void FilteredPrefStore::ReportValueChanged(const std::string& key,
+                                             uint32_t flags) {
+  StoreForKey(key)->ReportValueChanged(key, flags);
+}
+
+void FilteredPrefStore::SetValueSilently(const std::string& key,
+                                           std::unique_ptr<base::Value> value,
+                                           uint32_t flags) {
+  StoreForKey(key)->SetValueSilently(key, std::move(value), flags);
+}
+
+bool FilteredPrefStore::ReadOnly() const {
+  return persistent_pref_store_->ReadOnly();
+}
+
+PersistentPrefStore::PrefReadError FilteredPrefStore::GetReadError() const {
+  return persistent_pref_store_->GetReadError();
+}
+
+PersistentPrefStore::PrefReadError FilteredPrefStore::ReadPrefs() {
+  return persistent_pref_store_->ReadPrefs();
+}
+
+void FilteredPrefStore::ReadPrefsAsync(ReadErrorDelegate* error_delegate) {
+  read_error_delegate_.reset(error_delegate);
+  persistent_pref_store_->ReadPrefsAsync(nullptr);
+}
+
+void FilteredPrefStore::CommitPendingWrite() {
+  persistent_pref_store_->CommitPendingWrite();
+}
+
+void FilteredPrefStore::SchedulePendingLossyWrites() {
+  persistent_pref_store_->SchedulePendingLossyWrites();
+}
+
+void FilteredPrefStore::ClearMutableValues() {
+  NOTIMPLEMENTED();
+}
+
+FilteredPrefStore::~FilteredPrefStore() {
+  volatile_pref_store_->RemoveObserver(&aggregating_observer_);
+  persistent_pref_store_->RemoveObserver(&aggregating_observer_);
+}
+
+PersistentPrefStore* FilteredPrefStore::StoreForKey(const std::string& key) {
+  if (base::ContainsKey(persistent_preference_names_, key)) {
+    return persistent_pref_store_.get();
+  } else {
+    return volatile_pref_store_.get();
+  }
+}
+
+const PersistentPrefStore* FilteredPrefStore::StoreForKey(
+    const std::string& key) const {
+  if (base::ContainsKey(persistent_preference_names_, key)) {
+    return persistent_pref_store_.get();
+  } else {
+    return volatile_pref_store_.get();
+  }
+}
+
+} // namespace oxide
diff --git a/shared/browser/filtered_pref_store.h b/shared/browser/filtered_pref_store.h
new file mode 100644
index 0000000..07eee99
--- /dev/null
+++ b/shared/browser/filtered_pref_store.h
@@ -0,0 +1,107 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_FILTERED_PREF_STORE_H_
+#define _OXIDE_SHARED_BROWSER_FILTERED_PREF_STORE_H_
+
+#include <set>
+#include <string>
+
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/observer_list.h"
+#include "components/prefs/persistent_pref_store.h"
+
+class InMemoryPrefStore;
+class JsonPrefStore;
+
+namespace oxide {
+
+// Inspired by chromium's SegregatedPrefStore: all preferences are stored
+// in memory (and thus not persisted) except for a selected set which are
+// persisted on disk.
+class FilteredPrefStore : public PersistentPrefStore {
+ public:
+  FilteredPrefStore(
+      const scoped_refptr<InMemoryPrefStore>& volatile_pref_store,
+      const scoped_refptr<JsonPrefStore>& persistent_pref_store,
+      const std::set<std::string>& persistent_pref_names);
+
+  // PrefStore:
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
+  bool HasObservers() const override;
+  bool IsInitializationComplete() const override;
+  bool GetValue(const std::string& key,
+                const base::Value** result) const override;
+  std::unique_ptr<base::DictionaryValue> GetValues() const override;
+
+  // WriteablePrefStore:
+  void SetValue(const std::string& key,
+                std::unique_ptr<base::Value> value,
+                uint32_t flags) override;
+  void RemoveValue(const std::string& key, uint32_t flags) override;
+
+  // PersistentPrefStore:
+  bool GetMutableValue(const std::string& key, base::Value** result) override;
+  void ReportValueChanged(const std::string& key, uint32_t flags) override;
+  void SetValueSilently(const std::string& key,
+                        std::unique_ptr<base::Value> value,
+                        uint32_t flags) override;
+  bool ReadOnly() const override;
+  PrefReadError GetReadError() const override;
+  PrefReadError ReadPrefs() override;
+  void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override;
+  void CommitPendingWrite() override;
+  void SchedulePendingLossyWrites() override;
+
+  void ClearMutableValues() override;
+
+ private:
+  class AggregatingObserver : public PrefStore::Observer {
+   public:
+    explicit AggregatingObserver(FilteredPrefStore* outer);
+
+    // PrefStore::Observer:
+    void OnPrefValueChanged(const std::string& key) override;
+    void OnInitializationCompleted(bool succeeded) override;
+
+   private:
+    FilteredPrefStore* outer_;
+
+    DISALLOW_COPY_AND_ASSIGN(AggregatingObserver);
+  };
+
+  ~FilteredPrefStore() override;
+
+  PersistentPrefStore* StoreForKey(const std::string& key);
+  const PersistentPrefStore* StoreForKey(const std::string& key) const;
+
+  scoped_refptr<InMemoryPrefStore> volatile_pref_store_;
+  scoped_refptr<JsonPrefStore> persistent_pref_store_;
+  std::set<std::string> persistent_preference_names_;
+
+  std::unique_ptr<PersistentPrefStore::ReadErrorDelegate> read_error_delegate_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
+  AggregatingObserver aggregating_observer_;
+
+  DISALLOW_COPY_AND_ASSIGN(FilteredPrefStore);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_FILTERED_PREF_STORE_H_
diff --git a/shared/browser/filtered_pref_store_unittest.cc b/shared/browser/filtered_pref_store_unittest.cc
new file mode 100644
index 0000000..90e67d8
--- /dev/null
+++ b/shared/browser/filtered_pref_store_unittest.cc
@@ -0,0 +1,209 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2017 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "base/files/file_util.h"
+#include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "base/values.h"
+#include "components/prefs/in_memory_pref_store.h"
+#include "components/prefs/json_pref_store.h"
+#include "components/prefs/pref_filter.h"
+#include "components/prefs/pref_store_observer_mock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+#include "filtered_pref_store.h"
+
+namespace {
+
+const char kPersistentStoreFileName[] = "store.json";
+const char kEmptyJson[] = "{}";
+const char kInvalidJson[] = "invalid";
+
+const char kPersistentPref[] = "persistent_pref";
+const char kVolatilePref[] = "volatile_pref";
+const char kSharedPref[] = "shared_pref";
+
+} // namespace
+
+namespace oxide {
+
+class FilteredPrefStoreTest : public testing::Test {
+ public:
+  FilteredPrefStoreTest() = default;
+
+ protected:
+  void SetUp() override {
+    volatile_store_ = new InMemoryPrefStore;
+
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    persistent_store_filepath_ =
+        temp_dir_.GetPath().AppendASCII(kPersistentStoreFileName);
+    persistent_store_ = new JsonPrefStore(persistent_store_filepath_,
+                                          message_loop_.task_runner(),
+                                          std::unique_ptr<PrefFilter>());
+    std::set<std::string> persistent_pref_names;
+    persistent_pref_names.insert(kPersistentPref);
+    persistent_pref_names.insert(kSharedPref);
+
+    filtered_store_ = new FilteredPrefStore(volatile_store_, persistent_store_,
+                                            persistent_pref_names);
+
+    filtered_store_->AddObserver(&observer_);
+  }
+
+  void TearDown() override {
+    filtered_store_->RemoveObserver(&observer_);
+    base::RunLoop().RunUntilIdle();
+  }
+
+  base::ScopedTempDir temp_dir_;
+  base::FilePath persistent_store_filepath_;
+  base::MessageLoop message_loop_;
+
+  PrefStoreObserverMock observer_;
+
+  scoped_refptr<InMemoryPrefStore> volatile_store_;
+  scoped_refptr<JsonPrefStore> persistent_store_;
+  scoped_refptr<FilteredPrefStore> filtered_store_;
+
+  DISALLOW_COPY_AND_ASSIGN(FilteredPrefStoreTest);
+};
+
+TEST_F(FilteredPrefStoreTest, ReadPrefsNoFile) {
+  ASSERT_FALSE(base::PathExists(persistent_store_filepath_));
+  EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE,
+            filtered_store_->ReadPrefs());
+}
+
+TEST_F(FilteredPrefStoreTest, ReadPrefsParseError) {
+  ASSERT_LT(0, base::WriteFile(persistent_store_filepath_,
+                               kInvalidJson, arraysize(kInvalidJson) - 1));
+  ASSERT_TRUE(base::PathExists(persistent_store_filepath_));
+  EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_JSON_PARSE,
+            filtered_store_->ReadPrefs());
+}
+
+TEST_F(FilteredPrefStoreTest, ReadPrefsSuccess) {
+  ASSERT_LT(0, base::WriteFile(persistent_store_filepath_,
+                               kEmptyJson, arraysize(kEmptyJson) - 1));
+  ASSERT_TRUE(base::PathExists(persistent_store_filepath_));
+  EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
+            filtered_store_->ReadPrefs());
+}
+
+TEST_F(FilteredPrefStoreTest, IsInitializationComplete) {
+  EXPECT_FALSE(filtered_store_->IsInitializationComplete());
+  filtered_store_->ReadPrefs();
+  EXPECT_TRUE(filtered_store_->IsInitializationComplete());
+}
+
+TEST_F(FilteredPrefStoreTest, Observer) {
+  EXPECT_FALSE(observer_.initialized);
+  filtered_store_->ReadPrefs();
+  EXPECT_TRUE(observer_.initialized);
+  EXPECT_TRUE(observer_.initialization_success);
+  EXPECT_TRUE(observer_.changed_keys.empty());
+  filtered_store_->SetValue(kPersistentPref,
+                            base::MakeUnique<base::Value>(1),
+                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  observer_.VerifyAndResetChangedKey(kPersistentPref);
+  filtered_store_->SetValue(kVolatilePref,
+                            base::MakeUnique<base::Value>(2),
+                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  observer_.VerifyAndResetChangedKey(kVolatilePref);
+}
+
+TEST_F(FilteredPrefStoreTest, StoreValues) {
+  PrefStoreObserverMock volatile_observer;
+  volatile_store_->AddObserver(&volatile_observer);
+
+  PrefStoreObserverMock persistent_observer;
+  persistent_store_->AddObserver(&persistent_observer);
+
+  filtered_store_->ReadPrefs();
+  EXPECT_TRUE(persistent_observer.initialized);
+  EXPECT_TRUE(persistent_observer.initialization_success);
+
+  filtered_store_->SetValue(kPersistentPref,
+                            base::MakeUnique<base::Value>(3),
+                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  persistent_observer.VerifyAndResetChangedKey(kPersistentPref);
+  EXPECT_TRUE(persistent_store_->GetValue(kPersistentPref, nullptr));
+  EXPECT_FALSE(volatile_store_->GetValue(kPersistentPref, nullptr));
+  EXPECT_TRUE(filtered_store_->GetValue(kPersistentPref, nullptr));
+
+  filtered_store_->SetValue(kVolatilePref,
+                            base::MakeUnique<base::Value>(4),
+                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  volatile_observer.VerifyAndResetChangedKey(kVolatilePref);
+  EXPECT_TRUE(volatile_store_->GetValue(kVolatilePref, nullptr));
+  EXPECT_FALSE(persistent_store_->GetValue(kVolatilePref, nullptr));
+  EXPECT_TRUE(filtered_store_->GetValue(kVolatilePref, nullptr));
+}
+
+TEST_F(FilteredPrefStoreTest, ReadValues) {
+  filtered_store_->ReadPrefs();
+  persistent_store_->SetValue(kPersistentPref,
+                              base::MakeUnique<base::Value>(5),
+                              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  volatile_store_->SetValue(kVolatilePref,
+                            base::MakeUnique<base::Value>(6),
+                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+
+  EXPECT_TRUE(persistent_store_->GetValue(kPersistentPref, nullptr));
+  EXPECT_FALSE(persistent_store_->GetValue(kVolatilePref, nullptr));
+
+  EXPECT_TRUE(volatile_store_->GetValue(kVolatilePref, nullptr));
+  EXPECT_FALSE(volatile_store_->GetValue(kPersistentPref, nullptr));
+
+  EXPECT_TRUE(filtered_store_->GetValue(kPersistentPref, nullptr));
+  EXPECT_TRUE(filtered_store_->GetValue(kVolatilePref, nullptr));
+}
+
+TEST_F(FilteredPrefStoreTest, GetValues) {
+  filtered_store_->ReadPrefs();
+  persistent_store_->SetValue(kPersistentPref,
+                              base::MakeUnique<base::Value>(7),
+                              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  volatile_store_->SetValue(kVolatilePref,
+                            base::MakeUnique<base::Value>(8),
+                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+
+  persistent_store_->SetValue(kSharedPref,
+                              base::MakeUnique<base::Value>(9),
+                              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  volatile_store_->SetValue(kSharedPref,
+                            base::MakeUnique<base::Value>(10),
+                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+
+  auto values = filtered_store_->GetValues();
+  const base::Value* value = nullptr;
+
+  EXPECT_TRUE(values->Get(kPersistentPref, &value));
+  EXPECT_TRUE(base::Value(7).Equals(value));
+
+  EXPECT_TRUE(values->Get(kVolatilePref, &value));
+  EXPECT_TRUE(base::Value(8).Equals(value));
+
+  EXPECT_TRUE(values->Get(kSharedPref, &value));
+  EXPECT_TRUE(base::Value(9).Equals(value));
+}
+
+} // namespace oxide
diff --git a/shared/browser/oxide_browser_context.cc b/shared/browser/oxide_browser_context.cc
index 5652924..265efc5 100644
--- a/shared/browser/oxide_browser_context.cc
+++ b/shared/browser/oxide_browser_context.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,16 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/worker_pool.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs/in_memory_pref_store.h"
+#include "components/prefs/json_pref_store.h"
+#include "components/prefs/overlay_user_pref_store.h"
+#include "components/prefs/pref_filter.h"
+#include "components/prefs/pref_notifier_impl.h"
+#include "components/prefs/pref_value_store.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h" // nogncheck
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
@@ -67,6 +76,7 @@
 #include "shared/common/oxide_constants.h"
 #include "shared/common/oxide_content_client.h"
 
+#include "filtered_pref_store.h"
 #include "oxide_browser_context_delegate.h"
 #include "oxide_browser_context_destroyer.h"
 #include "oxide_browser_process_main.h"
@@ -123,6 +133,8 @@ void CleanupOldCacheDir(const base::FilePath& path) {
   base::DeleteFile(path, true);
 }
 
+void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) {}
+
 } // namespace
 
 class MainURLRequestContextGetter : public URLRequestContextGetter {
@@ -527,6 +539,41 @@ net::CookieStore* BrowserContextIOData::GetCookieStore() const {
   return cookie_store_owner_->store();
 }
 
+ClonablePrefService::ClonablePrefService(
+    PrefNotifierImpl* pref_notifier,
+    PrefValueStore* pref_value_store,
+    PersistentPrefStore* user_prefs,
+    PrefRegistry* pref_registry,
+    base::Callback<void(PersistentPrefStore::PrefReadError)>
+        read_error_callback,
+    bool async)
+    : PrefService(pref_notifier,
+                  pref_value_store,
+                  user_prefs,
+                  pref_registry,
+                  read_error_callback,
+                  async) {
+}
+
+ClonablePrefService::~ClonablePrefService() {}
+
+ClonablePrefService* ClonablePrefService::CreateIncognitoPrefService() {
+  PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
+  OverlayUserPrefStore* incognito_pref_store =
+      new OverlayUserPrefStore(user_pref_store_.get());
+  return new ClonablePrefService(
+      pref_notifier,
+      pref_value_store_->CloneAndSpecialize(nullptr,
+                                            nullptr,
+                                            nullptr,
+                                            nullptr,
+                                            incognito_pref_store,
+                                            nullptr,
+                                            pref_registry_->defaults().get(),
+                                            pref_notifier),
+      incognito_pref_store, pref_registry_.get(), read_error_callback_, false);
+}
+
 class BrowserContextImpl;
 
 class OTRBrowserContextImpl : public BrowserContext {
@@ -578,6 +625,9 @@ OTRBrowserContextImpl::OTRBrowserContextImpl(
       original_context_(original) {
   BrowserContextDependencyManager::GetInstance()
       ->CreateBrowserContextServices(this);
+
+  prefs_.reset(static_cast<ClonablePrefService*>(original->GetPrefs())
+      ->CreateIncognitoPrefService());
 }
 
 BrowserContext* BrowserContextImpl::GetOffTheRecordContext() {
@@ -597,8 +647,15 @@ BrowserContextImpl::~BrowserContextImpl() {
 
 BrowserContextImpl::BrowserContextImpl(const BrowserContext::Params& params)
     : BrowserContext(new BrowserContextIODataImpl(params)) {
-  if (!GetPath().empty()) {
-    base::FilePath gpu_cache = GetPath().Append(FILE_PATH_LITERAL("GPUCache"));
+  base::FilePath path = GetPath();
+  if (!path.empty()) {
+    if (!base::PathExists(path)) {
+      if (!base::CreateDirectory(path)) {
+        LOG(ERROR) << "Failed to create profile data path: " << path.value();
+      }
+    }
+
+    base::FilePath gpu_cache = path.Append(FILE_PATH_LITERAL("GPUCache"));
     content::BrowserThread::PostTask(
         content::BrowserThread::FILE,
         FROM_HERE,
@@ -607,6 +664,44 @@ BrowserContextImpl::BrowserContextImpl(const BrowserContext::Params& params)
 
   BrowserContextDependencyManager::GetInstance()
       ->CreateBrowserContextServices(this);
+
+  autofill::AutofillManager::RegisterProfilePrefs(pref_registry_.get());
+  pref_registry_->SetDefaultPrefValue(
+      autofill::prefs::kAutofillEnabled,
+      new base::Value(false));
+  PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
+  scoped_refptr<PersistentPrefStore> user_prefs;
+  if (!path.empty()) {
+    base::FilePath pref_store_path =
+        path.Append(FILE_PATH_LITERAL("Preferences"));
+    scoped_refptr<base::SequencedTaskRunner> task_runner =
+      JsonPrefStore::GetTaskRunnerForFile(
+          pref_store_path, content::BrowserThread::GetBlockingPool());
+    // Persist only selected preferences on disk
+    scoped_refptr<InMemoryPrefStore> volatile_pref_store(new InMemoryPrefStore);
+    scoped_refptr<JsonPrefStore> persistent_pref_store(new JsonPrefStore(
+        pref_store_path, task_runner, std::unique_ptr<PrefFilter>()));
+    std::set<std::string> persistent_pref_names;
+    persistent_pref_names.insert(autofill::prefs::kAutofillLastVersionDeduped);
+    user_prefs = make_scoped_refptr(new FilteredPrefStore(
+        volatile_pref_store, persistent_pref_store, persistent_pref_names));
+  } else {
+    user_prefs = make_scoped_refptr(new InMemoryPrefStore);
+  }
+  prefs_.reset(new ClonablePrefService(
+      pref_notifier,
+      new PrefValueStore(nullptr,
+                         nullptr,
+                         nullptr,
+                         nullptr,
+                         user_prefs.get(),
+                         nullptr,
+                         pref_registry_->defaults().get(),
+                         pref_notifier),
+      user_prefs.get(),
+      pref_registry_.get(),
+      base::Bind(&DoNothingHandleReadError),
+      true));
 }
 
 void BrowserContext::Deleter::operator()(BrowserContext* context) {
@@ -702,7 +797,8 @@ BrowserContext::CreateMediaRequestContextForStoragePartition(
 }
 
 BrowserContext::BrowserContext(BrowserContextIOData* io_data)
-    : io_data_(io_data) {
+    : pref_registry_(new user_prefs::PrefRegistrySyncable),
+      io_data_(io_data) {
   CHECK(BrowserProcessMain::GetInstance()->IsRunning()) <<
       "The main browser process components must be started before " <<
       "creating a context";
diff --git a/shared/browser/oxide_browser_context.h b/shared/browser/oxide_browser_context.h
index e7f30d5..de32778 100644
--- a/shared/browser/oxide_browser_context.h
+++ b/shared/browser/oxide_browser_context.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
+#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/cookie_store_factory.h"
@@ -49,6 +50,10 @@ class TransportSecurityState;
 
 }
 
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
 namespace oxide {
 
 class BrowserContext;
@@ -58,6 +63,7 @@ class BrowserContextDelegate;
 class BrowserContextImpl;
 class BrowserContextSharedData;
 class BrowserContextSharedIOData;
+class ClonablePrefService;
 class CookieStoreOwner;
 class CookieStoreProxy;
 class GeolocationPermissionContext;
@@ -136,7 +142,20 @@ class BrowserContextIOData {
       temporary_saved_permission_context_;
 };
 
-class BrowserContext;
+class ClonablePrefService : public PrefService {
+ public:
+  ClonablePrefService(
+      PrefNotifierImpl* pref_notifier,
+      PrefValueStore* pref_value_store,
+      PersistentPrefStore* user_prefs,
+      PrefRegistry* pref_registry,
+      base::Callback<void(PersistentPrefStore::PrefReadError)>
+          read_error_callback,
+      bool async);
+  ~ClonablePrefService() override;
+
+  ClonablePrefService* CreateIncognitoPrefService();
+};
 
 // This class holds the context needed for a browsing session. It lives on
 // and must only be accessed on the UI thread
@@ -230,11 +249,16 @@ class OXIDE_SHARED_EXPORT BrowserContext : public content::BrowserContext,
 
   BrowserContextIOData* GetIOData() const;
 
+  PrefService* GetPrefs() { return prefs_.get(); }
+
  protected:
   BrowserContext(BrowserContextIOData* io_data);
 
   BrowserContextIOData* io_data() const { return io_data_; }
 
+  scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
+  std::unique_ptr<ClonablePrefService> prefs_;
+
  private:
   // content::BrowserContext implementation
   std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
diff --git a/shared/browser/oxide_browser_platform_integration.cc b/shared/browser/oxide_browser_platform_integration.cc
index e30abbe..10340a8 100644
--- a/shared/browser/oxide_browser_platform_integration.cc
+++ b/shared/browser/oxide_browser_platform_integration.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014-2015 Canonical Ltd.
+// Copyright (C) 2014-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -30,6 +30,7 @@ namespace oxide {
 namespace {
 
 const char kDefaultApplicationName[] = "Oxide";
+const char kDefaultApplicationLocale[] = "C";
 
 BrowserPlatformIntegration* g_instance;
 
@@ -88,6 +89,10 @@ std::string BrowserPlatformIntegration::GetApplicationName() {
   return kDefaultApplicationName;
 }
 
+std::string BrowserPlatformIntegration::GetApplicationLocale() {
+  return kDefaultApplicationLocale;
+}
+
 std::unique_ptr<DragSource> BrowserPlatformIntegration::CreateDragSource(
     DragSourceClient* client) {
   return nullptr;
diff --git a/shared/browser/oxide_browser_platform_integration.h b/shared/browser/oxide_browser_platform_integration.h
index 57f8568..18c6f93 100644
--- a/shared/browser/oxide_browser_platform_integration.h
+++ b/shared/browser/oxide_browser_platform_integration.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014-2015 Canonical Ltd.
+// Copyright (C) 2014-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -116,6 +116,9 @@ class OXIDE_SHARED_EXPORT BrowserPlatformIntegration {
   // Get the application name. Can be called on any thread
   virtual std::string GetApplicationName();
 
+  // Get the application locale. Can be called on any thread
+  virtual std::string GetApplicationLocale();
+
   // Create a new DragSource implementation. Ownership of |client| is not
   // transferred, and |client| will outlive the returned DragSource.
   // Called on the UI thread
diff --git a/shared/browser/oxide_content_browser_client.cc b/shared/browser/oxide_content_browser_client.cc
index c5b627a..b26fa9e 100644
--- a/shared/browser/oxide_content_browser_client.cc
+++ b/shared/browser/oxide_content_browser_client.cc
@@ -22,9 +22,12 @@
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
+#include "components/autofill/content/browser/content_autofill_driver_factory.h"
+#include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/permission_type.h"
@@ -34,10 +37,12 @@
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_info.h"
+#include "content/public/common/service_names.mojom.h"
 #include "content/public/common/web_preferences.h"
 #include "ppapi/features/features.h"
 #include "services/device/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/native_theme/native_theme_switches.h"
 
@@ -79,6 +84,8 @@
 #include "pepper/oxide_pepper_host_factory_browser.h"
 #endif
 
+#include "shared/grit/oxide_resources.h"
+
 namespace oxide {
 
 content::BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
@@ -316,6 +323,23 @@ ContentBrowserClient::GetDevToolsManagerDelegate() {
   return new DevToolsManagerDelegate();
 }
 
+void ContentBrowserClient::RegisterRenderFrameMojoInterfaces(
+    service_manager::InterfaceRegistry* registry,
+    content::RenderFrameHost* render_frame_host) {
+  DCHECK(registry);
+  registry->AddInterface(
+      base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver,
+                 render_frame_host));
+  registry->AddInterface(
+      base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
+                     BindPasswordManagerDriver,
+                 render_frame_host));
+  registry->AddInterface(
+      base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
+                     BindSensitiveInputVisibilityService,
+                 render_frame_host));
+}
+
 void ContentBrowserClient::RegisterInProcessServices(
     StaticServiceMap* services) {
   content::ServiceInfo device_info;
@@ -330,6 +354,23 @@ void ContentBrowserClient::RegisterInProcessServices(
   services->insert(std::make_pair(device::mojom::kServiceName, device_info));
 }
 
+std::unique_ptr<base::Value> ContentBrowserClient::GetServiceManifestOverlay(
+    base::StringPiece name) {
+  int id = -1;
+  if (name == content::mojom::kBrowserServiceName) {
+    id = IDR_OXIDE_BROWSER_MANIFEST_OVERLAY;
+  } else if (name == content::mojom::kRendererServiceName) {
+    id = IDR_OXIDE_RENDERER_MANIFEST_OVERLAY;
+  }
+  if (id == -1) {
+    return nullptr;
+  }
+
+  base::StringPiece manifest_contents =
+      ui::ResourceBundle::GetSharedInstance().GetRawDataResource(id);
+  return base::JSONReader::Read(manifest_contents);
+}
+
 void ContentBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
 #if BUILDFLAG(ENABLE_PLUGINS)
   host->GetPpapiHost()->AddHostFactoryFilter(
diff --git a/shared/browser/oxide_content_browser_client.h b/shared/browser/oxide_content_browser_client.h
index a55285a..2a963dc 100644
--- a/shared/browser/oxide_content_browser_client.h
+++ b/shared/browser/oxide_content_browser_client.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,6 @@ class ResourceDispatcherHostDelegate;
 namespace oxide {
 
 class BrowserPlatformIntegration;
-class ContentMainDelegate;
 class ResourceDispatcherHostDelegate;
 
 class ContentBrowserClient final : public content::ContentBrowserClient {
@@ -104,7 +103,12 @@ class ContentBrowserClient final : public content::ContentBrowserClient {
   void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
                            content::WebPreferences* prefs) override;
   content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
+  void RegisterRenderFrameMojoInterfaces(
+      service_manager::InterfaceRegistry* registry,
+      content::RenderFrameHost* render_frame_host) override;
   void RegisterInProcessServices(StaticServiceMap* services) override;
+  std::unique_ptr<base::Value> GetServiceManifestOverlay(
+      base::StringPiece name) override;
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
   gpu::GpuControlList::OsType GetOsTypeOverrideForGpuDataManager(
       std::string* os_version) override;
diff --git a/shared/browser/oxide_user_agent_settings.cc b/shared/browser/oxide_user_agent_settings.cc
index a1fe391..2a8550f 100644
--- a/shared/browser/oxide_user_agent_settings.cc
+++ b/shared/browser/oxide_user_agent_settings.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2016 Canonical Ltd.
+// Copyright (C) 2013-2017 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,7 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/strings/stringprintf.h"
+#include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "content/public/browser/browser_thread.h"
@@ -151,6 +152,10 @@ bool UserAgentSettingsIOData::GetDoNotTrack() const {
   return do_not_track_;
 }
 
+struct UserAgentSettings::DelayedPrefs {
+  bool autofill_enabled = false;
+};
+
 UserAgentSettings::UserAgentSettings(BrowserContext* context)
     : context_(context),
       product_(base::StringPrintf("Chrome/%s", CHROME_VERSION_STRING)),
@@ -159,6 +164,13 @@ UserAgentSettings::UserAgentSettings(BrowserContext* context)
   UserAgentSettingsIOData* io_data =
       context_->GetIOData()->GetUserAgentSettings();
   io_data->user_agent_ = content::BuildUserAgentFromProduct(product_);
+
+  PrefService* prefs = context->GetPrefs();
+  if (prefs->GetInitializationStatus() ==
+      PrefService::INITIALIZATION_STATUS_WAITING) {
+    prefs->AddPrefInitObserver(
+        base::Bind(&UserAgentSettings::OnPrefsLoaded, base::Unretained(this)));
+  }
 }
 
 UserAgentSettings::~UserAgentSettings() {}
@@ -207,6 +219,13 @@ void UserAgentSettings::RemoveObserver(UserAgentSettingsObserver* observer) {