Move service_qt back to main repo

Change-Id: I3d62b67167f03abbdd70ed86c144ad686c43b71e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 1 insertions, 236 deletions

diff --git a/chromium/chrome/browser/spellchecker/spellcheck_service.cc b/chromium/chrome/browser/spellchecker/spellcheck_service.cc
index bdf723d7000..76ea7855739 100644
--- a/chromium/chrome/browser/spellchecker/spellcheck_service.cc
+++ b/chromium/chrome/browser/spellchecker/spellcheck_service.cc
@@ -14,7 +14,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #if defined (TOOLKIT_QT)
-#include "qtwebengine/browser/service_qt.h"
+#include "service_qt.h"
 #else
 #include "chrome/browser/chrome_service.h"
 #include "chrome/common/constants.mojom.h"
diff --git a/chromium/qtwebengine/browser/service_qt.cc b/chromium/qtwebengine/browser/service_qt.cc
deleted file mode 100644
index 30ed269e8dd..00000000000
--- a/chromium/qtwebengine/browser/service_qt.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// based on chrome/browser/chrome_service.cc:
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "service_qt.h"
-
-#include "base/no_destructor.h"
-#include "components/spellcheck/spellcheck_buildflags.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/content_browser_client.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
-#include "services/service_manager/public/cpp/connector.h"
-#include "services/service_manager/public/cpp/service.h"
-#include "services/service_manager/public/cpp/service_context.h"
-
-#if BUILDFLAG(ENABLE_SPELLCHECK)
-#include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h"
-#endif
-
-class ServiceQt::IOThreadContext : public service_manager::Service {
-public:
-    IOThreadContext();
-    ~IOThreadContext() override = default;
-
-    void BindConnector(service_manager::mojom::ConnectorRequest connector_request);
-
-private:
-    void BindConnectorOnIOThread(service_manager::mojom::ConnectorRequest connector_request);
-
-    // service_manager::Service:
-    void OnStart() override;
-    void OnBindInterface(const service_manager::BindSourceInfo &remote_info,
-                         const std::string &name,
-                         mojo::ScopedMessagePipeHandle handle) override;
-
-    service_manager::mojom::ConnectorRequest m_connectorRequest;
-    service_manager::BinderRegistry m_registry;
-    service_manager::BinderRegistryWithArgs<const service_manager::BindSourceInfo&> m_registry_with_source_info;
-
-    DISALLOW_COPY_AND_ASSIGN(IOThreadContext);
-};
-
-ServiceQt::IOThreadContext::IOThreadContext()
-{
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner =
-            content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::UI);
-#if BUILDFLAG(ENABLE_SPELLCHECK)
-    m_registry_with_source_info.AddInterface(base::Bind(&SpellCheckHostChromeImpl::Create), ui_task_runner);
-#endif
-}
-
-void ServiceQt::IOThreadContext::BindConnector(service_manager::mojom::ConnectorRequest connector_request)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-    // NOTE: It's not safe to modify |connector_request_| here since it's read
-    // on the IO thread. Post a task instead. As long as this task is posted
-    // before any code attempts to connect to the chrome service, there's no
-    // race.
-    content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::IO)->PostTask(
-                FROM_HERE,
-                base::BindOnce(&IOThreadContext::BindConnectorOnIOThread,
-                               base::Unretained(this),
-                               std::move(connector_request)));
-}
-
-void ServiceQt::IOThreadContext::BindConnectorOnIOThread(service_manager::mojom::ConnectorRequest connector_request)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    m_connectorRequest = std::move(connector_request);
-}
-
-void ServiceQt::IOThreadContext::OnStart()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    DCHECK(m_connectorRequest.is_pending());
-    context()->connector()->BindConnectorRequest(std::move(m_connectorRequest));
-}
-
-void ServiceQt::IOThreadContext::OnBindInterface(const service_manager::BindSourceInfo &remote_info,
-                                                 const std::string &name,
-                                                 mojo::ScopedMessagePipeHandle handle)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    content::OverrideOnBindInterface(remote_info, name, &handle);
-    if (!handle.is_valid())
-        return;
-
-    if (!m_registry.TryBindInterface(name, &handle))
-        m_registry_with_source_info.TryBindInterface(name, &handle, remote_info);
-}
-
-ServiceQt *ServiceQt::GetInstance()
-{
-    static base::NoDestructor<ServiceQt> service;
-    return service.get();
-}
-
-service_manager::EmbeddedServiceInfo::ServiceFactory ServiceQt::CreateServiceQtFactory()
-{
-    return base::BindRepeating(&ServiceQt::CreateServiceQtWrapper, base::Unretained(this));
-}
-
-ServiceQt::ServiceQt() : m_ioThreadContext(std::make_unique<IOThreadContext>())
-{}
-
-ServiceQt::~ServiceQt() = default;
-
-void ServiceQt::InitConnector()
-{
-    service_manager::mojom::ConnectorRequest request;
-    m_connector = service_manager::Connector::Create(&request);
-    m_ioThreadContext->BindConnector(std::move(request));
-}
-
-std::unique_ptr<service_manager::Service> ServiceQt::CreateServiceQtWrapper()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    return std::make_unique<service_manager::ForwardingService>(m_ioThreadContext.get());
-}
diff --git a/chromium/qtwebengine/browser/service_qt.h b/chromium/qtwebengine/browser/service_qt.h
deleted file mode 100644
index 4aa0a399664..00000000000
--- a/chromium/qtwebengine/browser/service_qt.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SERVICE_QT_H
-#define SERVICE_QT_H
-
-#include "base/no_destructor.h"
-#include "services/service_manager/embedder/embedded_service_info.h"
-
-namespace service_manager {
-class Connector;
-class Service;
-}  // namespace service_manager
-
-class ServiceQt {
-public:
-    static ServiceQt *GetInstance();
-
-    void InitConnector();
-    service_manager::EmbeddedServiceInfo::ServiceFactory CreateServiceQtFactory();
-    service_manager::Connector *connector() { return m_connector.get(); }
-
-private:
-    friend class base::NoDestructor<ServiceQt>;
-    class IOThreadContext;
-
-    ServiceQt();
-    ~ServiceQt();
-
-    std::unique_ptr<service_manager::Service> CreateServiceQtWrapper();
-
-    const std::unique_ptr<IOThreadContext> m_ioThreadContext;
-
-    std::unique_ptr<service_manager::Connector> m_connector;
-
-    DISALLOW_COPY_AND_ASSIGN(ServiceQt);
-};
-
-#endif // SERVICE_QT_H