Revert of Enforce capability spec renderer <--> browser

content/browser/mojo/mojo_shell_context.cc

 // Copyright 2015 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 "content/browser/mojo/mojo_shell_context.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
-#include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "content/browser/gpu/gpu_process_host.h"
-#include "content/browser/mojo/merge_dictionary.h"
+#include "content/common/mojo/constants.h"
 #include "content/common/mojo/mojo_shell_connection_impl.h"
 #include "content/grit/content_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/mojo_shell_connection.h"
-#include "content/public/common/service_names.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "services/catalog/catalog.h"
 #include "services/catalog/manifest_provider.h"
 #include "services/catalog/store.h"
 #include "services/file/public/cpp/constants.h"
 #include "services/shell/connect_params.h"
 #include "services/shell/native_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/interfaces/service.mojom.h"
@@ skipping 83 matching lines @@
         resource_id, ui::ScaleFactor::SCALE_FACTOR_NONE).as_string();
     DCHECK(!contents.empty());
 
     DCHECK(manifests_);
     auto result = manifests_->insert(std::make_pair(name, contents));
     DCHECK(result.second) << "Duplicate manifest entry: " << name;
   }
 
  private:
   // catalog::ManifestProvider:
-  std::unique_ptr<base::Value> GetManifest(const std::string& name) override {
-    auto manifest_it = manifests_->find(name);
-    std::unique_ptr<base::Value> manifest_root;
-    if (manifest_it != manifests_->end())
-      manifest_root = base::JSONReader::Read(manifest_it->second);
-
-    base::DictionaryValue* manifest_dictionary = nullptr;
-    if (manifest_root && !manifest_root->GetAsDictionary(&manifest_dictionary))
-      return nullptr;
-
-    std::unique_ptr<base::Value> overlay_root =
-        GetContentClient()->browser()->GetServiceManifestOverlay(name);
-    if (overlay_root) {
-      if (!manifest_root) {
-        manifest_root = std::move(overlay_root);
-      } else {
-        base::DictionaryValue* overlay_dictionary = nullptr;
-        if (overlay_root->GetAsDictionary(&overlay_dictionary))
-          MergeDictionary(manifest_dictionary, overlay_dictionary);
-      }
+  bool GetApplicationManifest(const base::StringPiece& name,
+                              std::string* manifest_contents) override {
+    auto manifest_it = manifests_->find(name.as_string());
+    if (manifest_it != manifests_->end()) {
+      *manifest_contents = manifest_it->second;
+      DCHECK(!manifest_contents->empty());
+      return true;
     }
-    return manifest_root;
+    return false;
   }
 
   std::unique_ptr<ContentBrowserClient::MojoApplicationManifestMap> manifests_;
 
   DISALLOW_COPY_AND_ASSIGN(BuiltinManifestProvider);
 };
 
 }  // namespace
 
 // State which lives on the IO thread and drives the ServiceManager.
@@ skipping 148 matching lines @@
     in_process_context_->ShutDown();
 }
 
 // static
 shell::Connector* MojoShellContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content