Clean up visitedLinksManagerQt construction

Remove dependency on profileAdapter.

Change-Id: I362a0500413d39f2dec1d3a8bbc155df068d84ec
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 8 insertions, 10 deletions

diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp
index b080a4ced..6c80a9632 100644
--- a/src/core/profile_adapter.cpp
+++ b/src/core/profile_adapter.cpp
@@ -600,7 +600,7 @@ bool ProfileAdapter::isSpellCheckEnabled() const
 
 void ProfileAdapter::resetVisitedLinksManager()
 {
-    m_visitedLinksManager.reset(new VisitedLinksManagerQt(this));
+    m_visitedLinksManager.reset(new VisitedLinksManagerQt(m_profile.data(), persistVisitedLinks()));
 }
 
 void ProfileAdapter::setUseForGlobalCertificateVerification(bool enable)
diff --git a/src/core/profile_adapter.h b/src/core/profile_adapter.h
index 18e15954b..40633e802 100644
--- a/src/core/profile_adapter.h
+++ b/src/core/profile_adapter.h
@@ -168,7 +168,6 @@ public:
     void setHttpCacheMaxSize(int maxSize);
 
     bool trackVisitedLinks() const;
-    bool persistVisitedLinks() const;
 
     QWebEngineUrlSchemeHandler *urlSchemeHandler(const QByteArray &scheme);
     void installUrlSchemeHandler(const QByteArray &scheme, QWebEngineUrlSchemeHandler *handler);
@@ -198,6 +197,7 @@ public:
 private:
     void updateCustomUrlSchemeHandlers();
     void resetVisitedLinksManager();
+    bool persistVisitedLinks() const;
 
     QString m_name;
     bool m_offTheRecord;
diff --git a/src/core/visited_links_manager_qt.cpp b/src/core/visited_links_manager_qt.cpp
index ac27446b8..d4885e8e8 100644
--- a/src/core/visited_links_manager_qt.cpp
+++ b/src/core/visited_links_manager_qt.cpp
@@ -39,7 +39,6 @@
 
 #include "visited_links_manager_qt.h"
 
-#include "profile_adapter.h"
 #include "content_browser_client_qt.h"
 #include "profile_qt.h"
 #include "type_conversion.h"
@@ -106,14 +105,13 @@ static void ensureDirectoryExists(const base::FilePath &path)
              errorstr.c_str());
 }
 
-VisitedLinksManagerQt::VisitedLinksManagerQt(ProfileAdapter *adapter)
+VisitedLinksManagerQt::VisitedLinksManagerQt(ProfileQt *profile, bool persistVisitedLinks)
     : m_delegate(new VisitedLinkDelegateQt)
 {
-    Q_ASSERT(adapter && adapter->profile());
-    ProfileQt *profile = adapter->profile();
-    if (adapter->persistVisitedLinks())
+    Q_ASSERT(profile);
+    if (persistVisitedLinks)
         ensureDirectoryExists(profile->GetPath());
-    m_visitedLinkMaster.reset(new visitedlink::VisitedLinkMaster(profile, m_delegate.data(), adapter->persistVisitedLinks()));
+    m_visitedLinkMaster.reset(new visitedlink::VisitedLinkMaster(profile, m_delegate.data(), persistVisitedLinks));
     m_visitedLinkMaster->Init();
 }
 
diff --git a/src/core/visited_links_manager_qt.h b/src/core/visited_links_manager_qt.h
index 8d9a7495b..5bbcc5983 100644
--- a/src/core/visited_links_manager_qt.h
+++ b/src/core/visited_links_manager_qt.h
@@ -67,14 +67,14 @@ class GURL;
 
 namespace QtWebEngineCore {
 
-class ProfileAdapter;
+class ProfileQt;
 class VisitedLinkDelegateQt;
 
 class QWEBENGINECORE_PRIVATE_EXPORT VisitedLinksManagerQt {
 
 public:
     virtual~VisitedLinksManagerQt();
-    VisitedLinksManagerQt(ProfileAdapter *profileAdapter);
+    VisitedLinksManagerQt(ProfileQt *profile, bool persistVisitedLinks);
 
     void deleteAllVisitedLinkData();
     void deleteVisitedLinkDataForUrls(const QList<QUrl> &);