Make "all user" services work when packaged.

services/service_manager/standalone/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 "services/service_manager/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 164 matching lines @@
       std::unique_ptr<ServiceOverrides> service_overrides =
           base::MakeUnique<ServiceOverrides>(std::move(contents));
       for (const auto& iter : service_overrides->entries()) {
         if (!iter.second.package_name.empty())
           catalog_->OverridePackageName(iter.first, iter.second.package_name);
       }
       service_manager_->SetServiceOverrides(std::move(service_overrides));
     }
   }
 
+  bool enable_stats_collection_bindings =
+      command_line.HasSwitch(tracing::kEnableStatsCollectionBindings);
 
-  Identity source_identity = CreateServiceManagerIdentity();
-  Identity tracing_identity("service:tracing", mojom::kRootUserID);
-  tracing::mojom::FactoryPtr factory;
-  ConnectToInterface(service_manager(), source_identity, tracing_identity,
-                     &factory);
-  provider_.InitializeWithFactory(&factory);
+  if (enable_stats_collection_bindings ||
+      command_line.HasSwitch(switches::kEnableTracing)) {
+    Identity source_identity = CreateServiceManagerIdentity();
+    Identity tracing_identity("service:tracing", mojom::kRootUserID);
+    tracing::mojom::FactoryPtr factory;
+    ConnectToInterface(service_manager(), source_identity, tracing_identity,
+                       &factory);
+    provider_.InitializeWithFactory(&factory);
 
-  if (command_line.HasSwitch(tracing::kTraceStartup)) {
-    tracing::mojom::CollectorPtr coordinator;
-    ConnectToInterface(service_manager(), source_identity, tracing_identity,
-                       &coordinator);
-    tracer_.StartCollectingFromTracingService(std::move(coordinator));
-  }
+    if (command_line.HasSwitch(tracing::kTraceStartup)) {
+      tracing::mojom::CollectorPtr coordinator;
+      ConnectToInterface(service_manager(), source_identity, tracing_identity,
+                         &coordinator);
+      tracer_.StartCollectingFromTracingService(std::move(coordinator));
+    }
 
-  // Record the service manager startup metrics used for performance testing.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          tracing::kEnableStatsCollectionBindings)) {
-    tracing::mojom::StartupPerformanceDataCollectorPtr collector;
-    ConnectToInterface(service_manager(), source_identity, tracing_identity,
-                       &collector);
+    // Record the service manager startup metrics used for performance testing.
+    if (enable_stats_collection_bindings) {
+      tracing::mojom::StartupPerformanceDataCollectorPtr collector;
+      ConnectToInterface(service_manager(), source_identity, tracing_identity,
+                         &collector);
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
-    // CurrentProcessInfo::CreationTime is only defined on some platforms.
-    const base::Time creation_time = base::CurrentProcessInfo::CreationTime();
-    collector->SetServiceManagerProcessCreationTime(
-        creation_time.ToInternalValue());
+      // CurrentProcessInfo::CreationTime is only defined on some platforms.
+      const base::Time creation_time = base::CurrentProcessInfo::CreationTime();
+      collector->SetServiceManagerProcessCreationTime(
+          creation_time.ToInternalValue());
 #endif
-    collector->SetServiceManagerMainEntryPointTime(
-        main_entry_time_.ToInternalValue());
+      collector->SetServiceManagerMainEntryPointTime(
+          main_entry_time_.ToInternalValue());
+    }
   }
 }
 
 void Context::Shutdown() {
   // Actions triggered by Service Manager's destructor may require a current
   // message loop,
   // so we should destruct it explicitly now as ~Context() occurs post message
   // loop shutdown.
   service_manager_.reset();
 
@@ skipping 39 matching lines @@
   mojom::InterfaceProviderPtr local_interfaces;
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces));
   service_manager_->Connect(std::move(params));
 }
 
 }  // namespace service_manager