Allow Catalogs to be constructed per-user

mojo/shell/runner/host/native_application_support.cc

 // Copyright 2014 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 "mojo/shell/runner/host/native_application_support.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 27 matching lines @@
 }
 
 }  // namespace
 
 base::NativeLibrary LoadNativeApplication(const base::FilePath& app_path) {
   DVLOG(2) << "Loading Mojo app in process from library: " << app_path.value();
 
   base::NativeLibraryLoadError error;
   base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error);
   LOG_IF(ERROR, !app_library)
-      << "Failed to load app library (error: " << error.ToString() << ")";
+      << "Failed to load app library (path: " << app_path.value() << ")";
   return app_library;
 }
 
 bool RunNativeApplication(
     base::NativeLibrary app_library,
     InterfaceRequest<mojom::ShellClient> request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
     return false;
 
@@ skipping 41 matching lines @@
   MojoHandle handle = request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   if (result != MOJO_RESULT_OK) {
     LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
   }
   return true;
 }
 
 }  // namespace shell
 }  // namespace mojo