Clean up Data Decoder implementation

Removes dead code inside Data Decoder that was there to support its use
through Service Manager clients which no longer exist.

Bug: 977637
Change-Id: I379787ff50cf2d12bc364f17ed1d6a42d2c1b836
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1892671
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712795}

services/data_decoder/BUILD.gn

@@ -40,7 +40,6 @@ source_set("lib") {
 
   public_deps = [
     "//services/data_decoder/public/mojom",
-    "//services/service_manager/public/cpp",
   ]
 
   if (!is_ios) {
@@ -87,6 +86,7 @@ source_set("tests") {
     deps += [
       "//gin",
       "//gin:gin_test",
+      "//services/service_manager/public/cpp",
       "//third_party/blink/public:blink",
     ]
     data_deps = [

services/data_decoder/ble_scan_parser_impl.cc

@@ -29,9 +29,7 @@ const int kDataTypeManufacturerData = 0xFF;
 const char kUuidPrefix[] = "0000";
 const char kUuidSuffix[] = "-0000-1000-8000-00805F9B34FB";
 
-BleScanParserImpl::BleScanParserImpl(
-    std::unique_ptr<service_manager::ServiceContextRef> service_ref)
-    : service_ref_(std::move(service_ref)) {}
+BleScanParserImpl::BleScanParserImpl() = default;
 
 BleScanParserImpl::~BleScanParserImpl() = default;
 

services/data_decoder/ble_scan_parser_impl.h

@@ -13,7 +13,6 @@
 #include "base/macros.h"
 #include "device/bluetooth/public/mojom/uuid.mojom.h"
 #include "services/data_decoder/public/mojom/ble_scan_parser.mojom.h"
-#include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace data_decoder {
 
@@ -31,8 +30,7 @@ enum class UuidFormat {
 
 class BleScanParserImpl : public mojom::BleScanParser {
  public:
-  explicit BleScanParserImpl(
-      std::unique_ptr<service_manager::ServiceContextRef> service_ref);
+  BleScanParserImpl();
   ~BleScanParserImpl() override;
 
   // mojom::BleScanParser:
@@ -51,8 +49,6 @@ class BleScanParserImpl : public mojom::BleScanParser {
       std::vector<device::BluetoothUUID>* service_uuids);
 
  private:
-  const std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
-
   DISALLOW_COPY_AND_ASSIGN(BleScanParserImpl);
 };
 

services/data_decoder/bundled_exchanges_parser.h

@@ -13,7 +13,6 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/data_decoder/public/mojom/bundled_exchanges_parser.mojom.h"
-#include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace data_decoder {
 

services/data_decoder/bundled_exchanges_parser_factory.cc

@@ -45,9 +45,7 @@ class FileDataSource final : public mojom::BundleDataSource {
 
 }  // namespace
 
-BundledExchangesParserFactory::BundledExchangesParserFactory(
-    std::unique_ptr<service_manager::ServiceContextRef> service_ref)
-    : service_ref_(std::move(service_ref)) {}
+BundledExchangesParserFactory::BundledExchangesParserFactory() = default;
 
 BundledExchangesParserFactory::~BundledExchangesParserFactory() = default;
 

services/data_decoder/bundled_exchanges_parser_factory.h

@@ -12,15 +12,13 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/data_decoder/public/mojom/bundled_exchanges_parser.mojom.h"
-#include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace data_decoder {
 
 class BundledExchangesParserFactory
     : public mojom::BundledExchangesParserFactory {
  public:
-  explicit BundledExchangesParserFactory(
-      std::unique_ptr<service_manager::ServiceContextRef> service_ref);
+  BundledExchangesParserFactory();
   ~BundledExchangesParserFactory() override;
 
   std::unique_ptr<mojom::BundleDataSource> CreateFileDataSourceForTesting(
@@ -36,8 +34,6 @@ class BundledExchangesParserFactory
       mojo::PendingReceiver<mojom::BundledExchangesParser> receiver,
       mojo::PendingRemote<mojom::BundleDataSource> data_source) override;
 
-  const std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
-
   DISALLOW_COPY_AND_ASSIGN(BundledExchangesParserFactory);
 };
 

services/data_decoder/bundled_exchanges_parser_factory_unittest.cc

@@ -33,8 +33,7 @@ base::FilePath GetTestFilePath(const base::FilePath& path) {
 class BundledExchangesParserFactoryTest : public testing::Test {
  public:
   BundledExchangesParserFactoryTest()
-      : factory_(std::make_unique<BundledExchangesParserFactory>(
-            /*service_ref=*/nullptr)) {}
+      : factory_(std::make_unique<BundledExchangesParserFactory>()) {}
 
   std::unique_ptr<mojom::BundleDataSource> CreateFileDataSource(
       mojo::PendingReceiver<mojom::BundleDataSource> receiver,

services/data_decoder/bundled_exchanges_parser_fuzzer.cc

@@ -58,8 +58,7 @@ class BundledExchangesParserFuzzer {
     data_source_.AddReceiver(
         data_source_remote.InitWithNewPipeAndPassReceiver());
 
-    data_decoder::BundledExchangesParserFactory factory_impl(
-        /*service_ref=*/nullptr);
+    data_decoder::BundledExchangesParserFactory factory_impl;
     data_decoder::mojom::BundledExchangesParserFactory& factory = factory_impl;
     factory.GetParserForDataSource(parser_.BindNewPipeAndPassReceiver(),
                                    std::move(data_source_remote));

services/data_decoder/data_decoder_service.cc

@@ -28,24 +28,10 @@
 
 namespace data_decoder {
 
-namespace {
-
-constexpr auto kMaxServiceIdleTime = base::TimeDelta::FromSeconds(5);
-
-}  // namespace
-
-DataDecoderService::DataDecoderService()
-    : keepalive_(&binding_, kMaxServiceIdleTime) {}
-
-DataDecoderService::DataDecoderService(
-    mojo::PendingReceiver<service_manager::mojom::Service> receiver)
-    : DataDecoderService() {
-  binding_.Bind(std::move(receiver));
-}
+DataDecoderService::DataDecoderService() = default;
 
 DataDecoderService::DataDecoderService(
-    mojo::PendingReceiver<mojom::DataDecoderService> receiver)
-    : DataDecoderService() {
+    mojo::PendingReceiver<mojom::DataDecoderService> receiver) {
   receiver_.Bind(std::move(receiver));
 }
 
@@ -56,26 +42,6 @@ void DataDecoderService::BindReceiver(
   receiver_.Bind(std::move(receiver));
 }
 
-void DataDecoderService::OnBindInterface(
-    const service_manager::BindSourceInfo& source_info,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle interface_pipe) {
-  mojo::GenericPendingReceiver receiver(interface_name,
-                                        std::move(interface_pipe));
-  if (auto r = receiver.As<mojom::ImageDecoder>())
-    BindImageDecoder(std::move(r));
-  else if (auto r = receiver.As<mojom::JsonParser>())
-    BindJsonParser(std::move(r));
-  else if (auto r = receiver.As<mojom::XmlParser>())
-    BindXmlParser(std::move(r));
-  else if (auto r = receiver.As<mojom::BundledExchangesParserFactory>())
-    BindBundledExchangesParserFactory(std::move(r));
-#if defined(OS_CHROMEOS)
-  else if (auto r = receiver.As<mojom::BleScanParser>())
-    BindBleScanParser(std::move(r));
-#endif
-}
-
 void DataDecoderService::BindImageDecoder(
     mojo::PendingReceiver<mojom::ImageDecoder> receiver) {
 #if defined(OS_IOS)
@@ -83,8 +49,7 @@ void DataDecoderService::BindImageDecoder(
 #else
   if (drop_image_decoders_)
     return;
-  mojo::MakeSelfOwnedReceiver(
-      std::make_unique<ImageDecoderImpl>(keepalive_.CreateRef()),
+  mojo::MakeSelfOwnedReceiver(std::make_unique<ImageDecoderImpl>(),
                               std::move(receiver));
 #endif
 }
@@ -93,29 +58,26 @@ void DataDecoderService::BindJsonParser(
     mojo::PendingReceiver<mojom::JsonParser> receiver) {
   if (drop_json_parsers_)
     return;
-  mojo::MakeSelfOwnedReceiver(
-      std::make_unique<JsonParserImpl>(keepalive_.CreateRef()),
+  mojo::MakeSelfOwnedReceiver(std::make_unique<JsonParserImpl>(),
                               std::move(receiver));
 }
 
 void DataDecoderService::BindXmlParser(
     mojo::PendingReceiver<mojom::XmlParser> receiver) {
-  mojo::MakeSelfOwnedReceiver(
-      std::make_unique<XmlParser>(keepalive_.CreateRef()), std::move(receiver));
+  mojo::MakeSelfOwnedReceiver(std::make_unique<XmlParser>(),
+                              std::move(receiver));
 }
 
 void DataDecoderService::BindBundledExchangesParserFactory(
     mojo::PendingReceiver<mojom::BundledExchangesParserFactory> receiver) {
-  mojo::MakeSelfOwnedReceiver(
-      std::make_unique<BundledExchangesParserFactory>(keepalive_.CreateRef()),
+  mojo::MakeSelfOwnedReceiver(std::make_unique<BundledExchangesParserFactory>(),
                               std::move(receiver));
 }
 
 #ifdef OS_CHROMEOS
 void DataDecoderService::BindBleScanParser(
     mojo::PendingReceiver<mojom::BleScanParser> receiver) {
-  mojo::MakeSelfOwnedReceiver(
-      std::make_unique<BleScanParserImpl>(keepalive_.CreateRef()),
+  mojo::MakeSelfOwnedReceiver(std::make_unique<BleScanParserImpl>(),
                               std::move(receiver));
 }
 #endif  // OS_CHROMEOS

services/data_decoder/data_decoder_service.h

@@ -15,10 +15,6 @@
 #include "services/data_decoder/public/mojom/image_decoder.mojom.h"
 #include "services/data_decoder/public/mojom/json_parser.mojom.h"
 #include "services/data_decoder/public/mojom/xml_parser.mojom.h"
-#include "services/service_manager/public/cpp/service.h"
-#include "services/service_manager/public/cpp/service_binding.h"
-#include "services/service_manager/public/cpp/service_keepalive.h"
-#include "services/service_manager/public/mojom/service.mojom.h"
 
 #ifdef OS_CHROMEOS
 #include "services/data_decoder/public/mojom/ble_scan_parser.mojom.h"
@@ -26,12 +22,9 @@
 
 namespace data_decoder {
 
-class DataDecoderService : public service_manager::Service,
-                           public mojom::DataDecoderService {
+class DataDecoderService : public mojom::DataDecoderService {
  public:
   DataDecoderService();
-  explicit DataDecoderService(
-      mojo::PendingReceiver<service_manager::mojom::Service> receiver);
   explicit DataDecoderService(
       mojo::PendingReceiver<mojom::DataDecoderService> receiver);
   ~DataDecoderService() override;
@@ -41,11 +34,6 @@ class DataDecoderService : public service_manager::Service,
   // constructed.
   void BindReceiver(mojo::PendingReceiver<mojom::DataDecoderService> receiver);
 
-  // service_manager::Service implementation:
-  void OnBindInterface(const service_manager::BindSourceInfo& source_info,
-                       const std::string& interface_name,
-                       mojo::ScopedMessagePipeHandle interface_pipe) override;
-
   // Configures the service to drop ImageDecoder receivers instead of binding
   // them. Useful for tests simulating service failures.
   void SimulateImageDecoderCrashForTesting(bool drop) {
@@ -73,8 +61,6 @@ class DataDecoderService : public service_manager::Service,
       mojo::PendingReceiver<mojom::BleScanParser> receiver) override;
 #endif  // OS_CHROMEOS
 
-  service_manager::ServiceBinding binding_{this};
-  service_manager::ServiceKeepalive keepalive_;
   mojo::Receiver<mojom::DataDecoderService> receiver_{this};
 
   bool drop_image_decoders_ = false;

services/data_decoder/image_decoder_impl.cc

@@ -65,9 +65,7 @@ void ResizeImage(SkBitmap* decoded_image,
 
 }  // namespace
 
-ImageDecoderImpl::ImageDecoderImpl(
-    std::unique_ptr<service_manager::ServiceContextRef> service_ref)
-    : service_ref_(std::move(service_ref)) {}
+ImageDecoderImpl::ImageDecoderImpl() = default;
 
 ImageDecoderImpl::~ImageDecoderImpl() = default;
 

services/data_decoder/image_decoder_impl.h

@@ -9,15 +9,13 @@
 
 #include "base/macros.h"
 #include "services/data_decoder/public/mojom/image_decoder.mojom.h"
-#include "services/service_manager/public/cpp/service_context_ref.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace data_decoder {
 
 class ImageDecoderImpl : public mojom::ImageDecoder {
  public:
-  explicit ImageDecoderImpl(
-      std::unique_ptr<service_manager::ServiceContextRef> service_ref);
+  ImageDecoderImpl();
   ~ImageDecoderImpl() override;
 
   // Overridden from mojom::ImageDecoder:
@@ -33,8 +31,6 @@ class ImageDecoderImpl : public mojom::ImageDecoder {
                        DecodeAnimationCallback callback) override;
 
  private:
-  const std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
-
   DISALLOW_COPY_AND_ASSIGN(ImageDecoderImpl);
 };
 

services/data_decoder/image_decoder_impl_unittest.cc

@@ -98,8 +98,8 @@ base::LazyInstance<BlinkInitializer>::Leaky g_blink_initializer =
 
 class ImageDecoderImplTest : public testing::Test {
  public:
-  ImageDecoderImplTest() : decoder_(nullptr) {}
-  ~ImageDecoderImplTest() override {}
+  ImageDecoderImplTest() = default;
+  ~ImageDecoderImplTest() override = default;
 
   void SetUp() override { g_blink_initializer.Get(); }
 

services/data_decoder/json_parser_impl.cc

@@ -12,9 +12,7 @@
 
 namespace data_decoder {
 
-JsonParserImpl::JsonParserImpl(
-    std::unique_ptr<service_manager::ServiceContextRef> service_ref)
-    : service_ref_(std::move(service_ref)) {}
+JsonParserImpl::JsonParserImpl() = default;
 
 JsonParserImpl::~JsonParserImpl() = default;
 

services/data_decoder/json_parser_impl.h

@@ -9,19 +9,15 @@
 
 #include "base/macros.h"
 #include "services/data_decoder/public/mojom/json_parser.mojom.h"
-#include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace data_decoder {
 
 class JsonParserImpl : public mojom::JsonParser {
  public:
-  explicit JsonParserImpl(
-      std::unique_ptr<service_manager::ServiceContextRef> service_ref);
+  JsonParserImpl();
   ~JsonParserImpl() override;
 
  private:
-  const std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
-
   // mojom::JsonParser implementation.
   void Parse(const std::string& json, ParseCallback callback) override;
 

services/data_decoder/public/cpp/BUILD.gn

@@ -46,7 +46,6 @@ source_set("cpp") {
     ":service_provider",
     "//base",
     "//services/data_decoder/public/mojom",
-    "//services/service_manager/public/cpp",
   ]
 
   if (is_android) {

services/data_decoder/public/cpp/safe_xml_parser_unittest.cc

@@ -18,7 +18,7 @@ namespace data_decoder {
 namespace {
 
 std::unique_ptr<base::Value> ParseXml(const std::string& xml) {
-  XmlParser parser_impl(/*service_ref=*/nullptr);
+  XmlParser parser_impl;
   mojom::XmlParser& parser = parser_impl;
   std::unique_ptr<base::Value> root_node;
 

services/data_decoder/xml_parser.cc

@@ -103,9 +103,7 @@ void PopulateAttributes(base::Value* node_value, XmlReader* xml_reader) {
 
 }  // namespace
 
-XmlParser::XmlParser(
-    std::unique_ptr<service_manager::ServiceContextRef> service_ref)
-    : service_ref_(std::move(service_ref)) {}
+XmlParser::XmlParser() = default;
 
 XmlParser::~XmlParser() = default;
 

services/data_decoder/xml_parser.h

@@ -10,19 +10,15 @@
 
 #include "base/macros.h"
 #include "services/data_decoder/public/mojom/xml_parser.mojom.h"
-#include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace data_decoder {
 
 class XmlParser : public mojom::XmlParser {
  public:
-  explicit XmlParser(
-      std::unique_ptr<service_manager::ServiceContextRef> service_ref);
+  XmlParser();
   ~XmlParser() override;
 
  private:
-  const std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
-
   // mojom::XmlParser implementation.
   void Parse(const std::string& xml, ParseCallback callback) override;
 

services/data_decoder/xml_parser_fuzzer.cc

@@ -32,7 +32,7 @@ static ScopedXmlErrorFunc scoped_xml_error_func(nullptr, &ignore);
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   const char* data_ptr = reinterpret_cast<const char*>(data);
 
-  data_decoder::XmlParser xml_parser_impl(/*service_ref=*/nullptr);
+  data_decoder::XmlParser xml_parser_impl;
   data_decoder::mojom::XmlParser& xml_parser = xml_parser_impl;
 
   base::SingleThreadTaskExecutor main_thread_task_executor;

services/data_decoder/xml_parser_unittest.cc

@@ -28,7 +28,7 @@ void TestParseXmlCallback(std::unique_ptr<base::Value>* value_out,
 // Parses the passed in |xml| and compares the result to |json|.
 // If |json| is empty, the parsing is expected to fail.
 void TestParseXml(const std::string& xml, const std::string& json) {
-  XmlParser parser_impl(/*service_ref=*/nullptr);
+  XmlParser parser_impl;
   // Use a reference to mojom::XmlParser as XmlParser implements the interface
   // privately.
   mojom::XmlParser& parser = parser_impl;