Fix skydb to work for android

shell/context.cc

 // Copyright 2013 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 "shell/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "services/tracing/tracing.mojom.h"
@@ skipping 36 matching lines @@
   loader->RegisterContentHandler("application/pdf", GURL("mojo:pdf_viewer"));
   loader->RegisterContentHandler("image/png", GURL("mojo:png_viewer"));
   loader->RegisterContentHandler("text/html", GURL("mojo:html_viewer"));
 
   // Command-line-specified content handlers.
   std::string handlers_spec =
       command_line->GetSwitchValueASCII(switches::kContentHandlers);
   if (handlers_spec.empty())
     return;
 
+#if defined(OS_ANDROID)
+  // TODO(eseidel): On Android we pass command line arguments is via the
+  // 'parameters' key on the intent, which we specify during 'am shell start'
+  // via --esa, however that expects comma-separated values and says:
+  //   am shell --help:
+  //     [--esa <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]
+  //     (to embed a comma into a string escape it using "\,")
+  // Whatever takes 'parameters' and constructs a CommandLine is failing to
+  // un-escape the commas, we need to move this fix to that file.
+  ReplaceSubstringsAfterOffset(&handlers_spec, 0, "\\,", ",");

[abarth-chromium, 2015/01/09 22:59:19]

What about \\, ?

+#endif
+
   std::vector<std::string> parts;
   base::SplitString(handlers_spec, ',', &parts);
   if (parts.size() % 2 != 0) {
     LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
-               << ": must be a comma-separated list of mimetype/url pairs.";
+               << ": must be a comma-separated list of mimetype/url pairs."
+               << handlers_spec;
     return;
   }
 
   for (size_t i = 0; i < parts.size(); i += 2) {
     GURL url(parts[i + 1]);
     if (!url.is_valid()) {
       LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                  << ": '" << parts[i + 1] << "' is not a valid URL.";
       return;
     }
+    // TODO(eseidel): We should also validate that the mimetype is valid
+    // net/base/mime_util.h could do this, but we don't want to depend on net.
     loader->RegisterContentHandler(parts[i], url);
   }
 }
 
 class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> {
  private:
   void ConnectToService(const mojo::String& service_name,
                         ScopedMessagePipeHandle client_handle) override {}
 };
 
@@ skipping 109 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(application_url,
                                                      service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo