Merge Chromium 44 and fixes

Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch,
which contains all the patches to build against Chromium 44.

Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00

1 files changed, 4 insertions, 6 deletions

diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index f3659a7d2..4265ddb1f 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -193,12 +193,11 @@ WebEngineContext::WebEngineContext()
     QVector<const char*> argv(args.size());
     for (int i = 0; i < args.size(); ++i)
         argv[i] = args[i].constData();
-    CommandLine::Init(argv.size(), argv.constData());
+    base::CommandLine::Init(argv.size(), argv.constData());
 
-    CommandLine* parsedCommandLine = CommandLine::ForCurrentProcess();
+    base::CommandLine* parsedCommandLine = base::CommandLine::ForCurrentProcess();
     parsedCommandLine->AppendSwitchPath(switches::kBrowserSubprocessPath, WebEngineLibraryInfo::getPath(content::CHILD_PROCESS_EXE));
     parsedCommandLine->AppendSwitch(switches::kNoSandbox);
-    parsedCommandLine->AppendSwitch(switches::kDisablePlugins);
     parsedCommandLine->AppendSwitch(switches::kEnableDelegatedRenderer);
     parsedCommandLine->AppendSwitch(switches::kEnableThreadedCompositing);
     parsedCommandLine->AppendSwitch(switches::kInProcessGPU);
@@ -213,7 +212,6 @@ WebEngineContext::WebEngineContext()
         parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
         parsedCommandLine->AppendSwitch(switches::kDisableGpuShaderDiskCache);
         parsedCommandLine->AppendSwitch(switches::kDisable2dCanvasAntialiasing);
-        parsedCommandLine->AppendSwitch(switches::kEnableImplSidePainting);
         parsedCommandLine->AppendSwitch(cc::switches::kDisableCompositedAntialiasing);
         parsedCommandLine->AppendSwitchASCII(switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
     }
@@ -247,13 +245,13 @@ WebEngineContext::WebEngineContext()
     contentMainParams.sandbox_info = &sandbox_info;
 #endif
     m_contentRunner->Initialize(contentMainParams);
-    m_browserRunner->Initialize(content::MainFunctionParams(*CommandLine::ForCurrentProcess()));
+    m_browserRunner->Initialize(content::MainFunctionParams(*base::CommandLine::ForCurrentProcess()));
 
     // Once the MessageLoop has been created, attach a top-level RunLoop.
     m_runLoop.reset(new base::RunLoop);
     m_runLoop->BeforeRun();
 
-    m_devtools.reset(new DevToolsHttpHandlerDelegateQt);
+    m_devtools = createDevToolsHttpHandler();
     // Force the initialization of MediaCaptureDevicesDispatcher on the UI
     // thread to avoid a thread check assertion in its constructor when it
     // first gets referenced on the IO thread.