From 326996a7f95cbfe5301a929b6e3286f03263d46d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Wed, 4 Mar 2015 13:57:49 +0100
Subject: Fix namespace of SurfaceFactoryQt

Fix one class that didn't get refactored right.

Change-Id: Id0f2f92d8f68453002524de3c182e572cd657c6a
Reviewed-by: Stephan Binner <stephan.binner@basyskom.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
 src/core/surface_factory_qt.cpp | 2 +-
 src/core/surface_factory_qt.h   | 2 +-
 src/core/web_engine_context.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp
index 86a6a92d4..d5cb78f29 100644
--- a/src/core/surface_factory_qt.cpp
+++ b/src/core/surface_factory_qt.cpp
@@ -55,7 +55,7 @@
 #define QT_LIBDIR_GLES2 QT_LIBDIR_EGL
 #endif
 
-namespace QtWebEngine {
+namespace QtWebEngineCore {
 
 base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
     base::NativeLibraryLoadError error;
diff --git a/src/core/surface_factory_qt.h b/src/core/surface_factory_qt.h
index ea906e64f..7d6f0435e 100644
--- a/src/core/surface_factory_qt.h
+++ b/src/core/surface_factory_qt.h
@@ -43,7 +43,7 @@
 
 #include <QtGlobal>
 
-namespace QtWebEngine {
+namespace QtWebEngineCore {
 
 class SurfaceFactoryQt
     : public ui::SurfaceFactoryOzone
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index dbd8f2476..5f45aad98 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -75,7 +75,7 @@ private:
     scoped_ptr<content::ContentMainRunner> m_contentRunner;
     scoped_ptr<content::BrowserMainRunner> m_browserRunner;
 #if defined(OS_ANDROID)
-    scoped_ptr<QtWebEngine::SurfaceFactoryQt> m_surfaceFactory;
+    scoped_ptr<QtWebEngineCore::SurfaceFactoryQt> m_surfaceFactory;
 #endif
     QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_defaultBrowserContext;
     QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_offTheRecordBrowserContext;
-- 
cgit v1.2.3