Revert of [Service Manager] Get rid of dynamic service discovery

services/catalog/entry.cc

 // Copyright 2016 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 "services/catalog/entry.h"
 
-#include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
-#include "base/path_service.h"
 #include "base/values.h"
 #include "services/catalog/store.h"
 
+
 namespace catalog {
 namespace {
 
-#if defined(OS_WIN)
-const char kServiceExecutableExtension[] = ".service.exe";
-#else
-const char kServiceExecutableExtension[] = ".service";
-#endif
-
 bool ReadStringSet(const base::ListValue& list_value,
                    std::set<std::string>* string_set) {
   DCHECK(string_set);
   for (const auto& value_value : list_value) {
     std::string value;
     if (!value_value->GetAsString(&value)) {
       LOG(ERROR) << "Entry::Deserialize: list member must be a string";
       return false;
     }
     string_set->insert(value);
@@ skipping 103 matching lines @@
       requires->Set(i.first, std::move(capabilities));
     }
     spec->Set(Store::kInterfaceProviderSpecs_RequiresKey, std::move(requires));
     specs->Set(it.first, std::move(spec));
   }
   value->Set(Store::kInterfaceProviderSpecsKey, std::move(specs));
   return value;
 }
 
 // static
-std::unique_ptr<Entry> Entry::Deserialize(const base::Value& manifest_root) {
-  const base::DictionaryValue* dictionary_value = nullptr;
-  if (!manifest_root.GetAsDictionary(&dictionary_value))
-    return nullptr;
-  const base::DictionaryValue& value = *dictionary_value;
-
+std::unique_ptr<Entry> Entry::Deserialize(const base::DictionaryValue& value) {
   auto entry = base::MakeUnique<Entry>();
 
   // Name.
   std::string name;
   if (!value.GetString(Store::kNameKey, &name)) {
     LOG(ERROR) << "Entry::Deserialize: dictionary has no "
                << Store::kNameKey << " key";
     return nullptr;
   }
   if (name.empty()) {
     LOG(ERROR) << "Entry::Deserialize: empty service name.";
     return nullptr;
   }
   entry->set_name(name);
 
-  // By default we assume a standalone service executable. The catalog may
-  // override this layer based on configuration external to the service's own
-  // manifest.
-  base::FilePath module_path;
-  base::PathService::Get(base::DIR_MODULE, &module_path);
-  entry->set_path(module_path.AppendASCII(name + kServiceExecutableExtension));
-
   // Human-readable name.
   std::string display_name;
   if (!value.GetString(Store::kDisplayNameKey, &display_name)) {
     LOG(ERROR) << "Entry::Deserialize: dictionary has no "
                << Store::kDisplayNameKey << " key";
     return nullptr;
   }
   entry->set_display_name(display_name);
 
   // InterfaceProvider specs.
@@ skipping 85 matching lines @@
 catalog::mojom::EntryPtr
     TypeConverter<catalog::mojom::EntryPtr, catalog::Entry>::Convert(
         const catalog::Entry& input) {
   catalog::mojom::EntryPtr result(catalog::mojom::Entry::New());
   result->name = input.name();
   result->display_name = input.display_name();
   return result;
 }
 
 }  // namespace mojo