1 files changed, 12 insertions, 28 deletions
diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp
index 44b6ca4ef..4661f59fc 100644
--- a/src/core/browser_context_qt.cpp
+++ b/src/core/browser_context_qt.cpp
@@ -36,27 +36,21 @@
 
 #include "browser_context_qt.h"
 
+#include "browser_context_adapter.h"
+#include "download_manager_delegate_qt.h"
 #include "type_conversion.h"
 #include "qtwebenginecoreglobal.h"
 #include "resource_context_qt.h"
 #include "url_request_context_getter_qt.h"
 
-#include "base/files/scoped_temp_dir.h"
 #include "base/time/time.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/proxy/proxy_config_service.h"
 
-#include <QByteArray>
-#include <QCoreApplication>
-#include <QDir>
-#include <QStandardPaths>
-#include <QString>
-#include <QStringBuilder>
-
-BrowserContextQt::BrowserContextQt()
+BrowserContextQt::BrowserContextQt(BrowserContextAdapter *adapter)
+    : m_adapter(adapter)
 {
-    resourceContext.reset(new ResourceContextQt(this));
 }
 
 BrowserContextQt::~BrowserContextQt()
@@ -67,29 +61,17 @@ BrowserContextQt::~BrowserContextQt()
 
 base::FilePath BrowserContextQt::GetPath() const
 {
-    QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
-    if (dataLocation.isEmpty())
-        dataLocation = QDir::homePath() % QDir::separator() % QChar::fromLatin1('.') % QCoreApplication::applicationName();
-
-    dataLocation.append(QDir::separator() % QLatin1String("QtWebEngine"));
-    dataLocation.append(QDir::separator() % QLatin1String("Default"));
-    return base::FilePath(toFilePathString(dataLocation));
+    return toFilePath(m_adapter->dataPath());
 }
 
 base::FilePath BrowserContextQt::GetCachePath() const
 {
-    QString cacheLocation = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
-    if (cacheLocation.isEmpty())
-        cacheLocation = QDir::homePath() % QDir::separator() % QChar::fromLatin1('.') % QCoreApplication::applicationName();
-
-    cacheLocation.append(QDir::separator() % QLatin1String("QtWebEngine"));
-    cacheLocation.append(QDir::separator() % QLatin1String("Default"));
-    return base::FilePath(toFilePathString(cacheLocation));
+    return toFilePath(m_adapter->cachePath());
 }
 
 bool BrowserContextQt::IsOffTheRecord() const
 {
-    return false;
+    return m_adapter->isOffTheRecord();
 }
 
 net::URLRequestContextGetter *BrowserContextQt::GetRequestContext()
@@ -119,12 +101,14 @@ net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContextForStorage
 
 content::ResourceContext *BrowserContextQt::GetResourceContext()
 {
+    if (!resourceContext)
+        resourceContext.reset(new ResourceContextQt(this));
     return resourceContext.get();
 }
 
 content::DownloadManagerDelegate *BrowserContextQt::GetDownloadManagerDelegate()
 {
-    return downloadManagerDelegate.get();
+    return m_adapter->downloadManagerDelegate();
 }
 
 content::BrowserPluginGuestManager *BrowserContextQt::GetGuestManager()
@@ -145,7 +129,7 @@ content::PushMessagingService *BrowserContextQt::GetPushMessagingService()
 
 net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers)
 {
-    url_request_getter_ = new URLRequestContextGetterQt(GetPath(), GetCachePath(), protocol_handlers);
-    static_cast<ResourceContextQt*>(resourceContext.get())->set_url_request_context_getter(url_request_getter_.get());
+    url_request_getter_ = new URLRequestContextGetterQt(m_adapter, protocol_handlers);
+    static_cast<ResourceContextQt*>(GetResourceContext())->set_url_request_context_getter(url_request_getter_.get());
     return url_request_getter_.get();
 }