Merge ~osomon/oxide:autofill-profiles-management into oxide:master

[Olivier Tilloy]

New API on WebContext for autofill profiles management.

2861ed9... by Olivier Tilloy on 2017-03-08

Ensure that the autofill profiles have been loaded before accessing them.

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

Reduce the height of the autofill entries.

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

Preview autofill entry under mouse cursor.

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

Highlight currently selected suggestion.

06c7bad... by Olivier Tilloy on 2017-03-13

Simplify focus handling.

818af21... by Olivier Tilloy on 2017-03-13

Fix FTBFS.

c60a7e8... by Olivier Tilloy on 2017-03-13

Handle validation when no suggestion is selected.

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

Add a unit test for autofill popup destruction.

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

Ensure unit tests are locale-independent.

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

Fix build errors when rebased on latest master.

67d903b... 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).

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

Move CreateAutofillPopup to WebContentsClient.

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

Bump version for new WebContext API to 1.23.

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

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

8d05925... 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.

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

Marked a private helper private.

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

Ensure that autofill works in incognito mode, as expected.

559bd23... by Olivier Tilloy on 2017-03-23

Add tests for autofill in incognito webviews.

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

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

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

Remove redundant std::move().

9b8a3c0... by Olivier Tilloy on 2017-03-23

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

7b47f20... by Olivier Tilloy on 2017-03-23

Take timeout into account.

75307e9... by Olivier Tilloy on 2017-03-23

Do not depend on the omnibox component in release builds.

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

Rename files for consistency with newly-added code.

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

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

0c5a23f... by Olivier Tilloy on 2017-03-23

Remove unused method.

867131f... by Olivier Tilloy on 2017-03-23

Make ownership of AutofillPopupController explicit.

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

Updated test.

3f0f3aa... by Olivier Tilloy on 2017-03-27

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

2283d7f... 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.

370bace... by Olivier Tilloy on 2017-04-18

Updated oxide.qmltypes.

Unmerged commits

370bace... by Olivier Tilloy on 2017-04-18

Updated oxide.qmltypes.

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

Updated test.

2861ed9... by Olivier Tilloy on 2017-03-08

Ensure that the autofill profiles have been loaded before accessing them.

1925106... by Olivier Tilloy on 2017-03-07

New API on WebContext for autofill profiles management.

2283d7f... 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.

3f0f3aa... by Olivier Tilloy on 2017-03-27

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

867131f... by Olivier Tilloy on 2017-03-23

Make ownership of AutofillPopupController explicit.

0c5a23f... by Olivier Tilloy on 2017-03-23

Remove unused method.

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

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

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

Rename files for consistency with newly-added code.

diff --git a/qt/core/browser/oxide_qt_web_context.cc b/qt/core/browser/oxide_qt_web_context.cc
index fc1492f..678ec86 100644
--- a/qt/core/browser/oxide_qt_web_context.cc
+++ b/qt/core/browser/oxide_qt_web_context.cc
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include <QDateTime>
-#include <QDebug>
 #include <QMetaMethod>
 #include <QNetworkCookie>
 #include <QObject>
@@ -30,10 +29,13 @@
 
 #include "base/auto_reset.h"
 #include "base/files/file_path.h"
+#include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/resource_request_info.h"
@@ -59,6 +61,7 @@
 #include "shared/browser/oxide_user_agent_settings.h"
 #include "shared/browser/oxide_user_script_master.h"
 #include "shared/browser/permissions/oxide_temporary_saved_permission_context.h"
+#include "shared/browser/personal_data_manager_factory.h"
 
 #include "oxide_qt_browser_startup.h"
 
@@ -85,6 +88,28 @@ int GetNextCookieRequestId() {
   return id++;
 }
 
+const char kAutofillOrigin[] = "oxide autofill";
+
+void PopulateAutofillProfileFromVariant(autofill::AutofillProfile* profile,
+                                        const QVariantMap& map) {
+#define SET_PROFILE_FIELD(field, key) \
+  profile->SetRawInfo(autofill::field, base::UTF8ToUTF16( \
+      map.value(QStringLiteral(key)).toString().toStdString()))
+  SET_PROFILE_FIELD(NAME_FIRST, "firstName");
+  SET_PROFILE_FIELD(NAME_MIDDLE, "middleName");
+  SET_PROFILE_FIELD(NAME_LAST, "lastName");
+  SET_PROFILE_FIELD(NAME_FULL, "fullName");
+  SET_PROFILE_FIELD(COMPANY_NAME, "companyName");
+  SET_PROFILE_FIELD(ADDRESS_HOME_STREET_ADDRESS, "address");
+  SET_PROFILE_FIELD(ADDRESS_HOME_CITY, "city");
+  SET_PROFILE_FIELD(ADDRESS_HOME_STATE, "state");
+  SET_PROFILE_FIELD(ADDRESS_HOME_ZIP, "zip");
+  SET_PROFILE_FIELD(ADDRESS_HOME_COUNTRY, "country");
+  SET_PROFILE_FIELD(PHONE_HOME_WHOLE_NUMBER, "phone");
+  SET_PROFILE_FIELD(EMAIL_ADDRESS, "email");
+#undef SET_PROFILE_FIELD
+}
+
 }
 
 class WebContext::BrowserContextDelegate
@@ -453,7 +478,13 @@ WebContext::WebContext(WebContextProxyClient* client,
 WebContext::~WebContext() {
   if (context_.get()) {
     context_->SetDelegate(nullptr);
+
     MediaCaptureDevicesContext::Get(context_.get())->set_client(nullptr);
+
+    autofill::PersonalDataManager* manager =
+        PersonalDataManagerFactory::GetForContext(context_.get());
+    DCHECK(manager);
+    manager->RemoveObserver(this);
   }
 }
 
@@ -538,6 +569,12 @@ BrowserContext* WebContext::GetContext() {
 
   UpdateUserScripts();
 
+  autofill::PersonalDataManager* manager =
+      PersonalDataManagerFactory::GetForContext(context_.get());
+  DCHECK(manager);
+  manager->AddObserver(this);
+  client_->AutofillProfilesChanged();
+
   return context_.get();
 }
 
@@ -1001,6 +1038,10 @@ void WebContext::DefaultVideoDeviceChanged() {
   client_->DefaultVideoCaptureDeviceChanged();
 }
 
+void WebContext::OnPersonalDataChanged() {
+  client_->AutofillProfilesChanged();
+}
+
 bool WebContext::doNotTrack() const {
   if (IsInitialized()) {
     return UserAgentSettings::Get(context_.get())->GetDoNotTrack();
@@ -1033,5 +1074,107 @@ void WebContext::setAutofillEnabled(bool enabled) {
   }
 }
 
+bool WebContext::autofillProfilesLoaded() const {
+  if (!IsInitialized()) {
+    return false;
+  }
+
+  autofill::PersonalDataManager* manager =
+      PersonalDataManagerFactory::GetForContext(context_.get());
+  DCHECK(manager);
+  return manager->IsDataLoaded();
+}
+
+QStringList WebContext::getAutofillProfiles() const {
+  if (!autofillProfilesLoaded()) {
+    return QStringList();
+  }
+
+  autofill::PersonalDataManager* manager =
+      PersonalDataManagerFactory::GetForContext(context_.get());
+  QStringList rv;
+  for (auto profile : manager->GetProfiles()) {
+    rv.append(QString::fromStdString(profile->guid()));
+  }
+  return rv;
+}
+
+QVariant WebContext::getAutofillProfile(const QString& guid) const {
+  if (!autofillProfilesLoaded()) {
+    return QVariant();
+  }
+
+  autofill::PersonalDataManager* manager =
+      PersonalDataManagerFactory::GetForContext(context_.get());
+  autofill::AutofillProfile* profile =
+      manager->GetProfileByGUID(guid.toStdString());
+  if (!profile) {
+    return QVariant();
+  }
+
+  QVariantMap rv;
+  const std::string& locale = manager->app_locale();
+  rv[QStringLiteral("guid")] = QString::fromStdString(profile->guid());
+  rv[QStringLiteral("origin")] = QString::fromStdString(profile->origin());
+#define GET_PROFILE_FIELD(key, field) \
+  rv[QStringLiteral(key)] = QString::fromStdString(base::UTF16ToUTF8( \
+      profile->GetInfo(autofill::AutofillType(autofill::field), locale)))
+  GET_PROFILE_FIELD("firstName", NAME_FIRST);
+  GET_PROFILE_FIELD("middleName", NAME_MIDDLE);
+  GET_PROFILE_FIELD("lastName", NAME_LAST);
+  GET_PROFILE_FIELD("fullName", NAME_FULL);
+  GET_PROFILE_FIELD("companyName", COMPANY_NAME);
+  GET_PROFILE_FIELD("address", ADDRESS_HOME_STREET_ADDRESS);
+  GET_PROFILE_FIELD("city", ADDRESS_HOME_CITY);
+  GET_PROFILE_FIELD("state", ADDRESS_HOME_STATE);
+  GET_PROFILE_FIELD("zip", ADDRESS_HOME_ZIP);
+  GET_PROFILE_FIELD("country", ADDRESS_HOME_COUNTRY);
+  GET_PROFILE_FIELD("phone", PHONE_HOME_WHOLE_NUMBER);
+  GET_PROFILE_FIELD("email", EMAIL_ADDRESS);
+#undef GET_PROFILE_FIELD
+  return rv;
+}
+
+void WebContext::addAutofillProfile(const QVariant& profile) {
+  if (!autofillProfilesLoaded()) {
+    return;
+  }
+
+  autofill::PersonalDataManager* manager =
+      PersonalDataManagerFactory::GetForContext(context_.get());
+  autofill::AutofillProfile ap(base::GenerateGUID(), kAutofillOrigin);
+  PopulateAutofillProfileFromVariant(&ap, profile.toMap());
+  manager->AddProfile(ap);
+}
+
+void WebContext::removeAutofillProfile(const QString& guid) {
+  if (!autofillProfilesLoaded()) {
+    return;
+  }
+
+  autofill::PersonalDataManager* manager =
+      PersonalDataManagerFactory::GetForContext(context_.get());
+  manager->RemoveByGUID(guid.toStdString());
+}
+
+void WebContext::updateAutofillProfile(const QVariant& profile) {
+  if (!autofillProfilesLoaded()) {
+    return;
+  }
+
+  QVariantMap map = profile.toMap();
+  if (!map.contains(QStringLiteral("guid"))) {
+    return;
+  }
+
+  autofill::PersonalDataManager* manager =
+      PersonalDataManagerFactory::GetForContext(context_.get());
+  autofill::AutofillProfile ap(
+      map.value(QStringLiteral("guid")).toString().toStdString(),
+      map.value(QStringLiteral("origin")).toString().toStdString());
+  PopulateAutofillProfileFromVariant(&ap, profile.toMap());
+  manager->UpdateProfile(ap);
+}
+
 } // 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 1dd4134..ef5817c 100644
--- a/qt/core/browser/oxide_qt_web_context.h
+++ b/qt/core/browser/oxide_qt_web_context.h
@@ -29,6 +29,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "net/cookies/canonical_cookie.h"
 
 #include "qt/core/glue/oxide_qt_web_context_proxy.h"
@@ -67,7 +68,8 @@ class WebContextGetter : public base::RefCountedThreadSafe<WebContextGetter> {
 };
 
 class WebContext : public WebContextProxy,
-                   public oxide::MediaCaptureDevicesContextClient {
+                   public oxide::MediaCaptureDevicesContextClient,
+                   public autofill::PersonalDataManagerObserver {
  public:
   WebContext(WebContextProxyClient* client, QObject* handle);
   ~WebContext();
@@ -147,10 +149,20 @@ class WebContext : public WebContextProxy,
   bool autofillEnabled() const override;
   void setAutofillEnabled(bool enabled) override;
 
+  bool autofillProfilesLoaded() const override;
+  QStringList getAutofillProfiles() const override;
+  QVariant getAutofillProfile(const QString& guid) const override;
+  void addAutofillProfile(const QVariant& profile) override;
+  void removeAutofillProfile(const QString& guid) override;
+  void updateAutofillProfile(const QVariant& profile) override;
+
   // oxide::MediaCaptureDevicesContextClient implementation
   void DefaultAudioDeviceChanged() override;
   void DefaultVideoDeviceChanged() override;
 
+  // autofill::PersonalDataManagerObserver implementation
+  void OnPersonalDataChanged() override;
+
   WebContextProxyClient* client_;
 
   BrowserContext::UniquePtr context_;
diff --git a/qt/core/glue/oxide_qt_web_context_proxy.h b/qt/core/glue/oxide_qt_web_context_proxy.h
index 49f0180..59b9b6b 100644
--- a/qt/core/glue/oxide_qt_web_context_proxy.h
+++ b/qt/core/glue/oxide_qt_web_context_proxy.h
@@ -23,6 +23,7 @@
 #include <QStringList>
 #include <QtGlobal>
 #include <QUrl>
+#include <QVariant>
 #include <QWeakPointer>
 
 #include "qt/core/api/oxideqglobal.h"
@@ -140,6 +141,13 @@ class OXIDE_QTCORE_EXPORT WebContextProxy : public ProxyBase<WebContext> {
 
   virtual bool autofillEnabled() const = 0;
   virtual void setAutofillEnabled(bool enabled) = 0;
+
+  virtual bool autofillProfilesLoaded() const = 0;
+  virtual QStringList getAutofillProfiles() const = 0;
+  virtual QVariant getAutofillProfile(const QString& guid) const = 0;
+  virtual void addAutofillProfile(const QVariant& profile) = 0;
+  virtual void removeAutofillProfile(const QString& guid) = 0;
+  virtual void updateAutofillProfile(const QVariant& profile) = 0;
 };
 
 } // namespace qt
diff --git a/qt/core/glue/oxide_qt_web_context_proxy_client.h b/qt/core/glue/oxide_qt_web_context_proxy_client.h
index a449c60..9c710d9 100644
--- a/qt/core/glue/oxide_qt_web_context_proxy_client.h
+++ b/qt/core/glue/oxide_qt_web_context_proxy_client.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
@@ -51,6 +51,8 @@ class WebContextProxyClient {
 
   virtual void DefaultVideoCaptureDeviceChanged() = 0;
 
+  virtual void AutofillProfilesChanged() = 0;
+
   class IOClient {
    public:
     virtual ~IOClient() {}
diff --git a/qt/qmlplugin/oxide.qmltypes b/qt/qmlplugin/oxide.qmltypes
index 1d7d164..2adbde8 100644
--- a/qt/qmlplugin/oxide.qmltypes
+++ b/qt/qmlplugin/oxide.qmltypes
@@ -186,6 +186,31 @@ Module {
         Method { name: "deny" }
     }
     Component {
+        name: "OxideQQuickAutofillProfiles"
+        prototype: "QAbstractListModel"
+        exports: ["AutofillProfiles 1.22"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "ready"; type: "bool"; isReadonly: true }
+        Method {
+            name: "get"
+            type: "QVariant"
+            Parameter { name: "guid"; type: "string" }
+        }
+        Method {
+            name: "add"
+            Parameter { name: "profile"; type: "QVariant" }
+        }
+        Method {
+            name: "remove"
+            Parameter { name: "guid"; type: "string" }
+        }
+        Method {
+            name: "update"
+            Parameter { name: "profile"; type: "QVariant" }
+        }
+    }
+    Component {
         name: "OxideQQuickCookieManager"
         prototype: "QObject"
         exports: ["CookieManager 1.0", "CookieManager 1.3"]
@@ -477,6 +502,13 @@ Module {
         Property { name: "userAgentOverrides"; revision: 3; type: "QVariantList" }
         Property { name: "doNotTrackEnabled"; revision: 3; type: "bool" }
         Property { name: "autofillEnabled"; revision: 4; type: "bool" }
+        Property {
+            name: "autofillProfiles"
+            revision: 4
+            type: "OxideQQuickAutofillProfiles"
+            isReadonly: true
+            isPointer: true
+        }
         Signal { name: "devtoolsBindIpChanged" }
         Signal { name: "hostMappingRulesChanged"; revision: 1 }
         Signal { name: "allowedExtraUrlSchemesChanged"; revision: 1 }
diff --git a/qt/qmlplugin/oxide_qml_plugin.cc b/qt/qmlplugin/oxide_qml_plugin.cc
index cf2e41c..749d66f 100644
--- a/qt/qmlplugin/oxide_qml_plugin.cc
+++ b/qt/qmlplugin/oxide_qml_plugin.cc
@@ -34,6 +34,7 @@
 #include "qt/core/api/oxideqsecuritystatus.h"
 #include "qt/core/api/oxideqsslcertificate.h"
 #include "qt/core/api/oxideqwebpreferences.h"
+#include "qt/quick/api/oxideqquickautofillprofiles.h"
 #include "qt/quick/api/oxideqquickcookiemanager_p.h"
 #include "qt/quick/api/oxideqquickglobal_p.h"
 #include "qt/quick/api/oxideqquicklocationbarcontroller.h"
@@ -217,6 +218,9 @@ class OxideQmlPlugin : public QQmlExtensionPlugin {
         "NavigationHistory is accessed via WebView.navigationHistory");
 
     qmlRegisterType<OxideQQuickWebContext, 4>(uri, 1, 22, "WebContext");
+    qmlRegisterUncreatableType<OxideQQuickAutofillProfiles>(
+        uri, 1, 22, "AutofillProfiles",
+        "AutofillProfiles is accessed via WebContext.autofillProfiles");
   }
 };
 
diff --git a/qt/quick/CMakeLists.txt b/qt/quick/CMakeLists.txt
index 3737b68..416a7ce 100644
--- a/qt/quick/CMakeLists.txt
+++ b/qt/quick/CMakeLists.txt
@@ -1,6 +1,6 @@
 # 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 @@ qt5_wrap_cpp(MOC_EXTRA
              api/oxideqquickwebcontextdelegateworker_p_p.h)
 
 set(OXIDE_QUICKLIB_SRCS
+    api/oxideqquickautofillprofiles.cc
     api/oxideqquickcookiemanager.cc
     api/oxideqquickglobal.cc
     api/oxideqquicklocationbarcontroller.cc
diff --git a/qt/quick/api/oxideqquickautofillprofiles.cc b/qt/quick/api/oxideqquickautofillprofiles.cc
 new file mode 100644
index 0000000..835984c
--- /dev/null
+++ b/qt/quick/api/oxideqquickautofillprofiles.cc
@@ -0,0 +1,193 @@
+// 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 "oxideqquickautofillprofiles.h"
+#include "oxideqquickautofillprofiles_p.h"
+
+#include <QString>
+
+#include "qt/core/glue/oxide_qt_web_context_proxy.h"
+
+OxideQQuickAutofillProfilesPrivate::OxideQQuickAutofillProfilesPrivate(
+    OxideQQuickAutofillProfiles* q)
+    : q_ptr(q),
+      model_items_need_rebuilding_(true) {}
+
+void OxideQQuickAutofillProfilesPrivate::ensureModelItemsAreBuilt() {
+  if (!model_items_need_rebuilding_) {
+    return;
+  }
+
+  Q_ASSERT(model_items_.isEmpty());
+  model_items_need_rebuilding_ = false;
+
+  QStringList guids = web_context_proxy_->getAutofillProfiles();
+  for (const auto& guid : guids) {
+    model_items_.append(web_context_proxy_->getAutofillProfile(guid));
+  }
+}
+
+void OxideQQuickAutofillProfilesPrivate::AutofillProfilesChanged() {
+  Q_Q(OxideQQuickAutofillProfiles);
+
+  model_items_need_rebuilding_ = false;
+  q->beginResetModel();
+  model_items_need_rebuilding_ = true;
+  model_items_.clear();
+  q->endResetModel();
+
+  Q_EMIT q->readyChanged();
+}
+
+OxideQQuickAutofillProfilesPrivate
+    ::~OxideQQuickAutofillProfilesPrivate() = default;
+
+// static
+OxideQQuickAutofillProfilesPrivate* OxideQQuickAutofillProfilesPrivate::get(
+    OxideQQuickAutofillProfiles* q) {
+  return q->d_func();
+}
+
+// static
+std::unique_ptr<OxideQQuickAutofillProfiles>
+OxideQQuickAutofillProfilesPrivate::Create() {
+  return std::unique_ptr<OxideQQuickAutofillProfiles>(
+      new OxideQQuickAutofillProfiles());
+}
+
+void OxideQQuickAutofillProfilesPrivate::SetWebContextProxy(
+    oxide::qt::WebContextProxy* proxy) {
+  web_context_proxy_ = proxy;
+}
+
+OxideQQuickAutofillProfiles::OxideQQuickAutofillProfiles()
+    : d_ptr(new OxideQQuickAutofillProfilesPrivate(this)) {}
+
+bool OxideQQuickAutofillProfiles::ready() const {
+  Q_D(const OxideQQuickAutofillProfiles);
+
+  return d->web_context_proxy_->autofillProfilesLoaded();
+}
+
+QHash<int, QByteArray> OxideQQuickAutofillProfiles::roleNames() const {
+  static QHash<int, QByteArray> roles;
+  if (roles.isEmpty()) {
+    roles[OxideQQuickAutofillProfilesPrivate::Guid] = "guid";
+    roles[OxideQQuickAutofillProfilesPrivate::Origin] = "origin";
+    roles[OxideQQuickAutofillProfilesPrivate::FirstName] = "firstName";
+    roles[OxideQQuickAutofillProfilesPrivate::MiddleName] = "middleName";
+    roles[OxideQQuickAutofillProfilesPrivate::LastName] = "lastName";
+    roles[OxideQQuickAutofillProfilesPrivate::FullName] = "fullName";
+    roles[OxideQQuickAutofillProfilesPrivate::CompanyName] = "companyName";
+    roles[OxideQQuickAutofillProfilesPrivate::Address] = "address";
+    roles[OxideQQuickAutofillProfilesPrivate::City] = "city";
+    roles[OxideQQuickAutofillProfilesPrivate::State] = "state";
+    roles[OxideQQuickAutofillProfilesPrivate::Zip] = "zip";
+    roles[OxideQQuickAutofillProfilesPrivate::Country] = "country";
+    roles[OxideQQuickAutofillProfilesPrivate::Phone] = "phone";
+    roles[OxideQQuickAutofillProfilesPrivate::Email] = "email";
+  }
+  return roles;
+}
+
+int OxideQQuickAutofillProfiles::rowCount(const QModelIndex& parent) const {
+  Q_UNUSED(parent);
+  Q_D(const OxideQQuickAutofillProfiles);
+
+  const_cast<OxideQQuickAutofillProfiles*>(this)
+      ->d_func()->ensureModelItemsAreBuilt();
+
+  return d->model_items_.size();
+}
+
+QVariant OxideQQuickAutofillProfiles::data(const QModelIndex& index,
+                                           int role) const {
+  Q_D(const OxideQQuickAutofillProfiles);
+
+  const_cast<OxideQQuickAutofillProfiles*>(this)
+      ->d_func()->ensureModelItemsAreBuilt();
+
+  if (!index.isValid()) {
+    return QVariant();
+  }
+
+  int row = index.row();
+  if ((row < 0) || (row >= d->model_items_.size())) {
+    return QVariant();
+  }
+
+  const QVariantMap& item = d->model_items_[row].toMap();
+
+  switch (role) {
+    case OxideQQuickAutofillProfilesPrivate::Guid:
+      return item.value(QStringLiteral("guid"));
+    case OxideQQuickAutofillProfilesPrivate::Origin:
+      return item.value(QStringLiteral("origin"));
+    case OxideQQuickAutofillProfilesPrivate::FirstName:
+      return item.value(QStringLiteral("firstName"));
+    case OxideQQuickAutofillProfilesPrivate::MiddleName:
+      return item.value(QStringLiteral("middleName"));
+    case OxideQQuickAutofillProfilesPrivate::LastName:
+      return item.value(QStringLiteral("lastName"));
+    case OxideQQuickAutofillProfilesPrivate::FullName:
+      return item.value(QStringLiteral("fullName"));
+    case OxideQQuickAutofillProfilesPrivate::CompanyName:
+      return item.value(QStringLiteral("companyName"));
+    case OxideQQuickAutofillProfilesPrivate::Address:
+      return item.value(QStringLiteral("address"));
+    case OxideQQuickAutofillProfilesPrivate::City:
+      return item.value(QStringLiteral("city"));
+    case OxideQQuickAutofillProfilesPrivate::State:
+      return item.value(QStringLiteral("state"));
+    case OxideQQuickAutofillProfilesPrivate::Zip:
+      return item.value(QStringLiteral("zip"));
+    case OxideQQuickAutofillProfilesPrivate::Country:
+      return item.value(QStringLiteral("country"));
+    case OxideQQuickAutofillProfilesPrivate::Phone:
+      return item.value(QStringLiteral("phone"));
+    case OxideQQuickAutofillProfilesPrivate::Email:
+      return item.value(QStringLiteral("email"));
+    default:
+      return QVariant();
+  }
+}
+
+OxideQQuickAutofillProfiles::~OxideQQuickAutofillProfiles() = default;
+
+QVariant OxideQQuickAutofillProfiles::get(const QString& guid) const {
+  Q_D(const OxideQQuickAutofillProfiles);
+
+  return d->web_context_proxy_->getAutofillProfile(guid);
+}
+
+void OxideQQuickAutofillProfiles::add(const QVariant& profile) {
+  Q_D(OxideQQuickAutofillProfiles);
+
+  d->web_context_proxy_->addAutofillProfile(profile);
+}
+
+void OxideQQuickAutofillProfiles::remove(const QString& guid) {
+  Q_D(OxideQQuickAutofillProfiles);
+
+  d->web_context_proxy_->removeAutofillProfile(guid);
+}
+
+void OxideQQuickAutofillProfiles::update(const QVariant& profile) {
+  Q_D(OxideQQuickAutofillProfiles);
+
+  d->web_context_proxy_->updateAutofillProfile(profile);
+}
diff --git a/qt/quick/api/oxideqquickautofillprofiles.h b/qt/quick/api/oxideqquickautofillprofiles.h
 new file mode 100644
index 0000000..7022037
--- /dev/null
+++ b/qt/quick/api/oxideqquickautofillprofiles.h
@@ -0,0 +1,68 @@
+// 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_QTQUICK_AUTOFILL_PROFILES
+#define OXIDE_QTQUICK_AUTOFILL_PROFILES
+
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QVariant>
+#include <QtQml/QtQml>
+
+#include <OxideQtQuick/oxideqquickglobal.h>
+
+class QString;
+
+class OxideQQuickAutofillProfilesPrivate;
+
+class OXIDE_QTQUICK_EXPORT OxideQQuickAutofillProfiles
+    : public QAbstractListModel {
+  Q_OBJECT
+
+  Q_PROPERTY(bool ready READ ready NOTIFY readyChanged)
+
+  Q_DECLARE_PRIVATE(OxideQQuickAutofillProfiles)
+  Q_DISABLE_COPY(OxideQQuickAutofillProfiles)
+
+ public:
+  ~OxideQQuickAutofillProfiles() Q_DECL_OVERRIDE;
+
+  bool ready() const;
+
+ public Q_SLOTS:
+  QVariant get(const QString& guid) const;
+  void add(const QVariant& profile);
+  void remove(const QString& guid);
+  void update(const QVariant& profile);
+
+ Q_SIGNALS:
+  void readyChanged();
+
+ private:
+  OxideQQuickAutofillProfiles();
+
+  // reimplemented from QAbstractListModel
+  QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+  int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
+
+  QScopedPointer<OxideQQuickAutofillProfilesPrivate> d_ptr;
+};
+
+QML_DECLARE_TYPE(OxideQQuickAutofillProfiles)
+
+#endif // OXIDE_QTQUICK_AUTOFILL_PROFILES
diff --git a/qt/quick/api/oxideqquickautofillprofiles_p.h b/qt/quick/api/oxideqquickautofillprofiles_p.h
 new file mode 100644
index 0000000..d47b60b
--- /dev/null
+++ b/qt/quick/api/oxideqquickautofillprofiles_p.h
@@ -0,0 +1,80 @@
+// 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_QUICK_API_AUTOFILL_PROFILES_P_H_
+#define _OXIDE_QT_QUICK_API_AUTOFILL_PROFILES_P_H_
+
+#include <memory>
+
+#include <QtGlobal>
+#include <QVariantList>
+
+namespace oxide {
+namespace qt {
+class WebContextProxy;
+}
+}
+
+class OxideQQuickAutofillProfiles;
+
+class OxideQQuickAutofillProfilesPrivate {
+  Q_DECLARE_PUBLIC(OxideQQuickAutofillProfiles)
+  Q_DISABLE_COPY(OxideQQuickAutofillProfilesPrivate)
+
+ public:
+  ~OxideQQuickAutofillProfilesPrivate();
+
+  static OxideQQuickAutofillProfilesPrivate* get(
+      OxideQQuickAutofillProfiles* q);
+
+  static std::unique_ptr<OxideQQuickAutofillProfiles> Create();
+
+  void SetWebContextProxy(oxide::qt::WebContextProxy* proxy);
+
+  void AutofillProfilesChanged();
+
+ private:
+  OxideQQuickAutofillProfilesPrivate(OxideQQuickAutofillProfiles* q);
+
+  void ensureModelItemsAreBuilt();
+
+  enum Roles {
+    Guid = Qt::UserRole + 1,
+    Origin,
+    FirstName,
+    MiddleName,
+    LastName,
+    FullName,
+    CompanyName,
+    Address,
+    City,
+    State,
+    Zip,
+    Country,
+    Phone,
+    Email
+  };
+
+  OxideQQuickAutofillProfiles* q_ptr;
+
+  oxide::qt::WebContextProxy* web_context_proxy_;
+
+  bool model_items_need_rebuilding_;
+  QVariantList model_items_;
+};
+
+#endif // _OXIDE_QT_QUICK_API_AUTOFILL_PROFILES_P_H_
diff --git a/qt/quick/api/oxideqquickwebcontext.cc b/qt/quick/api/oxideqquickwebcontext.cc
index 1946af0..92b99ee 100644
--- a/qt/quick/api/oxideqquickwebcontext.cc
+++ b/qt/quick/api/oxideqquickwebcontext.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,6 +35,8 @@
 #include "qt/core/glue/oxide_qt_web_context_proxy.h"
 #include "qt/quick/oxide_qquick_init.h"
 
+#include "oxideqquickautofillprofiles.h"
+#include "oxideqquickautofillprofiles_p.h"
 #include "oxideqquickcookiemanager_p.h"
 #include "oxideqquickuserscript.h"
 #include "oxideqquickuserscript_p.h"
@@ -213,7 +215,11 @@ OxideQQuickWebContextPrivate::OxideQQuickWebContextPrivate(
       proxy_(WebContextProxy::create(this, q)),
       constructed_(false),
       io_(new oxide::qquick::WebContextIODelegate()),
-      cookie_manager_(nullptr) {}
+      cookie_manager_(nullptr),
+      autofill_profiles_(OxideQQuickAutofillProfilesPrivate::Create()) {
+  OxideQQuickAutofillProfilesPrivate::get(autofill_profiles_.get())
+      ->SetWebContextProxy(proxy_.data());
+}
 
 void OxideQQuickWebContextPrivate::userScriptUpdated() {
   proxy_->updateUserScripts();
@@ -391,6 +397,13 @@ void OxideQQuickWebContextPrivate::DefaultVideoCaptureDeviceChanged() {
   emit q->defaultVideoCaptureDeviceIdChanged();
 }
 
+void OxideQQuickWebContextPrivate::AutofillProfilesChanged() {
+  Q_Q(OxideQQuickWebContext);
+
+  OxideQQuickAutofillProfilesPrivate::get(autofill_profiles_.get())
+      ->AutofillProfilesChanged();
+}
+
 OxideQQuickWebContextPrivate::~OxideQQuickWebContextPrivate() {}
 
 void OxideQQuickWebContextPrivate::delegateWorkerDestroyed(
@@ -1592,4 +1605,10 @@ void OxideQQuickWebContext::setAutofillEnabled(bool enabled) {
   emit autofillEnabledChanged();
 }
 
+OxideQQuickAutofillProfiles* OxideQQuickWebContext::autofillProfiles() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->autofill_profiles_.get();
+}
+
 #include "moc_oxideqquickwebcontext.cpp"
diff --git a/qt/quick/api/oxideqquickwebcontext.h b/qt/quick/api/oxideqquickwebcontext.h
index f8ca6fa..85c1773 100644
--- a/qt/quick/api/oxideqquickwebcontext.h
+++ b/qt/quick/api/oxideqquickwebcontext.h
@@ -30,6 +30,7 @@
 
 #include <OxideQtQuick/oxideqquickglobal.h>
 
+class OxideQQuickAutofillProfiles;
 class OxideQQuickCookieManager;
 class OxideQQuickWebContextDelegateWorker;
 class OxideQQuickUserScript;
@@ -78,6 +79,7 @@ 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_PROPERTY(OxideQQuickAutofillProfiles* autofillProfiles READ autofillProfiles CONSTANT REVISION 4)
 
   Q_ENUMS(CookiePolicy)
   Q_ENUMS(SessionCookieMode)
@@ -178,6 +180,8 @@ class OXIDE_QTQUICK_EXPORT OxideQQuickWebContext : public QObject,
   bool autofillEnabled() const;
   void setAutofillEnabled(bool enabled);
 
+  OxideQQuickAutofillProfiles* autofillProfiles() const;
+
  Q_SIGNALS:
   void productChanged();
   void userAgentChanged();
diff --git a/qt/quick/api/oxideqquickwebcontext_p.h b/qt/quick/api/oxideqquickwebcontext_p.h
index 262e132..4e9f34a 100644
--- a/qt/quick/api/oxideqquickwebcontext_p.h
+++ b/qt/quick/api/oxideqquickwebcontext_p.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,10 +25,13 @@
 #include <QStringList>
 #include <QtGlobal>
 
+#include <memory>
+
 #include "qt/core/glue/oxide_qt_web_context_proxy_client.h"
 
 #include "qt/quick/api/oxideqquickwebcontext.h"
 
+class OxideQQuickAutofillProfiles;
 class OxideQQuickWebContextDelegateWorker;
 class OxideQQuickUserScript;
 
@@ -108,6 +111,7 @@ class Q_DECL_EXPORT OxideQQuickWebContextPrivate
   QNetworkAccessManager* GetCustomNetworkAccessManager() override;
   void DefaultAudioCaptureDeviceChanged() override;
   void DefaultVideoCaptureDeviceChanged() override;
+  void AutofillProfilesChanged() override;
 
   OxideQQuickWebContext* q_ptr;
 
@@ -125,6 +129,8 @@ class Q_DECL_EXPORT OxideQQuickWebContextPrivate
 
   QStringList allowed_extra_url_schemes_;
 
+  std::unique_ptr<OxideQQuickAutofillProfiles> autofill_profiles_;
+
   Q_DISABLE_COPY(OxideQQuickWebContextPrivate);
 };
 
diff --git a/qt/tests/qmltests/api/tst_WebContext_autofillProfiles.qml b/qt/tests/qmltests/api/tst_WebContext_autofillProfiles.qml
 new file mode 100644
index 0000000..3c38ec2
--- /dev/null
+++ b/qt/tests/qmltests/api/tst_WebContext_autofillProfiles.qml
@@ -0,0 +1,141 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.22
+import Oxide.testsupport 1.0
+import Ubuntu.Components 1.3
+
+TestWebView {
+  id: webView
+
+  ListView {
+    id: listView
+    anchors.fill: parent
+    model: SortFilterModel {
+      model: webView.context ? webView.context.autofillProfiles: null
+      sort.property: "fullName"
+    }
+    delegate: Item {
+      objectName: "profile_delegate_%1".arg(index)
+      readonly property string guid: model.guid
+      readonly property string fullName: model.fullName
+    }
+  }
+
+  TestCase {
+    name: "WebContext_autofillProfiles"
+    when: windowShown
+
+    function makeProfile(firstName, lastName, companyName, address,
+                         city, zip, country, phone, email) {
+      var profile = new Object;
+      profile.firstName = firstName;
+      profile.lastName = lastName;
+      profile.companyName = companyName;
+      profile.address = address;
+      profile.city = city;
+      profile.zip = zip;
+      profile.country = country;
+      profile.phone = phone;
+      profile.email = email;
+      return profile;
+    }
+
+    function compareProfile(profile, fullName, firstName, lastName, companyName,
+                            address, city, zip, phone, email) {
+      compare(profile.fullName, fullName);
+      compare(profile.firstName, firstName);
+      compare(profile.lastName, lastName);
+      compare(profile.companyName, companyName);
+      compare(profile.address, address);
+      compare(profile.city, city);
+      compare(profile.zip, zip);
+      compare(profile.phone, phone);
+      compare(profile.email, email);
+    }
+
+    function getDelegate(index) {
+      return TestSupport.findItemInScene(listView,
+                                         "profile_delegate_%1".arg(index));
+    }
+
+    function initTestCase() {
+      webView.context.autofillEnabled = true;
+      tryCompare(webView.context.autofillProfiles, "ready", true);
+    }
+
+    function init() {
+      compare(listView.count, 0);
+    }
+
+    function test_WebContext_autofillProfiles_get_nonexistent_profile() {
+      compare(webView.context.autofillProfiles.get("I-DONT-EXIST"), undefined);
+    }
+
+    function test_WebContext_autofillProfiles_add_and_remove_profiles() {
+      var p1 = makeProfile("John", "Lennon", "Apple Records",
+                           "Beaconsfield Road", "Liverpool", "L25 6DA",
+                           "England", "[phone]", "[e-mail]");
+      webView.context.autofillProfiles.add(p1);
+      tryCompare(listView, "count", 1);
+      compare(getDelegate(0).fullName, "John Lennon");
+
+      var p2 = makeProfile("John", "Doe", "", "Park Avenue", "NYC", "NY 10016",
+                           "USA", "", "[e-mail]");
+      webView.context.autofillProfiles.add(p2);
+      tryCompare(listView, "count", 2);
+      verify(TestUtils.waitFor(function() {
+          return (getDelegate(0).fullName == "John Doe"); }));
+      compare(getDelegate(1).fullName, "John Lennon");
+
+      var guid0 = getDelegate(0).guid;
+      var guid1 = getDelegate(1).guid;
+      compareProfile(webView.context.autofillProfiles.get(guid0),
+                     "John Doe", "John", "Doe", "", "Park Avenue", "NYC",
+                     "NY 10016", "", "[e-mail]");
+      compareProfile(webView.context.autofillProfiles.get(guid1),
+                     "John Lennon", "John", "Lennon", "Apple Records",
+                     "Beaconsfield Road", "Liverpool", "L25 6DA",
+                     "[phone]", "[e-mail]");
+
+      webView.context.autofillProfiles.remove("I-DONT-EXIST");
+      compare(listView.count, 2);
+
+      webView.context.autofillProfiles.remove(guid1);
+      tryCompare(listView, "count", 1);
+      webView.context.autofillProfiles.remove(guid0);
+      tryCompare(listView, "count", 0);
+    }
+
+    function test_WebContext_autofillProfiles_update_profile() {
+      var p = makeProfile("John", "Lennon", "Apple Records",
+                          "Beaconsfield Road", "Liverpool", "L25 6DA",
+                          "England", "[phone]", "[e-mail]");
+      webView.context.autofillProfiles.add(p);
+      tryCompare(listView, "count", 1);
+      var delegate = getDelegate(0);
+      compare(delegate.fullName, "John Lennon");
+      var guid = delegate.guid;
+
+      // Try updating without specifying the GUID, nothing should happen
+      p.firstName = "Paul";
+      compare(p.guid, undefined);
+      webView.context.autofillProfiles.update(p);
+      compare(webView.context.autofillProfiles.get(guid).firstName, "John");
+
+      // Try updating with an invalid GUID, nothing should happen
+      p.guid = "I-DONT-EXIST";
+      webView.context.autofillProfiles.update(p);
+      compare(webView.context.autofillProfiles.get(guid).firstName, "John");
+
+      // Update the profile with its GUID
+      p.lastName = "McCartney";
+      p.guid = guid;
+      webView.context.autofillProfiles.update(p);
+      verify(TestUtils.waitFor(function() {
+          return (getDelegate(0).fullName == "Paul McCartney"); }));
+
+      webView.context.autofillProfiles.remove(guid);
+      tryCompare(listView, "count", 0);
+    }
+  }
+}
diff --git a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.qml b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.qml
index 8001673..e1954b0 100644
--- a/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.qml
+++ b/qt/tests/qmltests/ubuntu_ui/tst_WebViewAutofillPopup_autofill_profiles.qml
@@ -14,6 +14,21 @@ UbuntuTestWebView {
 
   focus: true
 
+  Component {
+    id: profilesViewFactory
+
+    ListView {
+      anchors.fill: parent
+      model: SortFilterModel {
+        model: webView.context ? webView.context.autofillProfiles: null
+      }
+      delegate: Item {
+        objectName: "profile_delegate_%1".arg(index)
+        readonly property string guid: model.guid
+      }
+    }
+  }
+
   TestCase {
     name: "WebViewAutofillPopup_autofill_profiles"
     when: windowShown
@@ -224,5 +239,43 @@ UbuntuTestWebView {
       tryCompare(popup, "count", 1);
       compare(getSuggestion(0).label, "Beaconsfield Road");
     }
+
+    function test_use_profile_added_from_settings() {
+      // Add a new profile
+      tryCompare(webView.context.autofillProfiles, "ready", true);
+      var profile = new Object;
+      profile.firstName = "Paul";
+      profile.lastName = "McCartney";
+      profile.address = "Penny Lane";
+      profile.city = "Liverpool";
+      profile.zip = "L18 1DE";
+      profile.email = "[e-mail]";
+      webView.context.autofillProfiles.add(profile);
+
+      typeStringInField("p", "firstname");
+      var popup = getAutofillPopup();
+      compare(popup.count, 1);
+      compare(getSuggestion(0).value, "Paul");
+      var item = getSuggestion(0);
+      mouseClick(item);
+      verify(waitForAutofillPopupToClose());
+      compare_field_value("firstname", "Paul");
+      compare_field_value("lastname", "McCartney");
+      compare_field_value("email", "[e-mail]");
+      compare_field_value("zipcode", "L18 1DE");
+      compare_field_value("city", "Liverpool");
+      compare_field_value("street", "Penny Lane");
+
+      // Remove the profile
+      var profilesView = profilesViewFactory.createObject(webView);
+      profilesView.model.filter.property = "firstName";
+      profilesView.model.filter.pattern = /^Paul$/;
+      tryCompare(profilesView, "count", 1);
+      var delegate = TestSupport.findItemInScene(profilesView,
+                                                 "profile_delegate_0");
+      webView.context.autofillProfiles.remove(delegate.guid);
+      tryCompare(profilesView, "count", 0);
+      profilesView.destroy();
+    }
   }
 }