Unglobalize browserContext

This patch makes it possible to have more than one BrowserContext,
for instance for off-the-record browsering but also to enable any
other configuration on browser context level.

This will make it possible to add page-groups settings and API for
settingsthat can only be done on BrowserContext level.

This patch does not expose any new API.

Change-Id: I0a0e194449cfb5a096a4ac6e2f2b3882b6b4cfa2
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 4 insertions, 19 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 28294dce7..f10dd7500 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -201,12 +201,10 @@ public:
 
     void PreMainMessageLoopRun() Q_DECL_OVERRIDE
     {
-        m_browserContext.reset(new BrowserContextQt());
     }
 
     void PostMainMessageLoopRun()
     {
-        m_browserContext.reset();
     }
 
     int PreCreateThreads() Q_DECL_OVERRIDE
@@ -217,13 +215,7 @@ public:
         return 0;
     }
 
-    BrowserContextQt* browser_context() const {
-        return m_browserContext.get();
-    }
-
 private:
-    scoped_ptr<BrowserContextQt> m_browserContext;
-
     DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsQt);
 };
 
@@ -347,22 +339,15 @@ void ContentBrowserClientQt::OverrideWebkitPrefs(content::RenderViewHost *rvh, c
         static_cast<WebContentsDelegateQt*>(webContents->GetDelegate())->overrideWebPreferences(webContents, web_prefs);
 }
 
-BrowserContextQt* ContentBrowserClientQt::browser_context() {
-    Q_ASSERT(m_browserMainParts);
-    return static_cast<BrowserMainPartsQt*>(m_browserMainParts)->browser_context();
-}
-
-net::URLRequestContextGetter* ContentBrowserClientQt::CreateRequestContext(content::BrowserContext* content_browser_context, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors)
+net::URLRequestContextGetter* ContentBrowserClientQt::CreateRequestContext(content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors)
 {
-    if (content_browser_context != browser_context())
-        fprintf(stderr, "Warning: off the record browser context not implemented !\n");
-    return static_cast<BrowserContextQt*>(browser_context())->CreateRequestContext(protocol_handlers);
+    return static_cast<BrowserContextQt*>(browser_context)->CreateRequestContext(protocol_handlers);
 }
 
-void ContentBrowserClientQt::enableInspector(bool enable)
+void ContentBrowserClientQt::enableInspector(bool enable, content::BrowserContext* browser_context)
 {
     if (enable && !m_devtools) {
-        m_devtools.reset(new DevToolsHttpHandlerDelegateQt(browser_context()));
+        m_devtools.reset(new DevToolsHttpHandlerDelegateQt(browser_context));
     } else if (!enable && m_devtools) {
         m_devtools.reset();
     }