| Index: mojo/runner/context.cc
|
| diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
|
| index 40c62772cdaa23706a034b7670a9624a915595ae..485b2f9a073974e26f8a123a77d2c747942f673f 100644
|
| --- a/mojo/runner/context.cc
|
| +++ b/mojo/runner/context.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/path_service.h"
|
| +#include "base/process/process_info.h"
|
| #include "base/run_loop.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_split.h"
|
| @@ -33,7 +34,8 @@
|
| #include "mojo/runner/in_process_native_runner.h"
|
| #include "mojo/runner/out_of_process_native_runner.h"
|
| #include "mojo/runner/switches.h"
|
| -#include "mojo/services/tracing/tracing.mojom.h"
|
| +#include "mojo/services/tracing/public/cpp/switches.h"
|
| +#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
|
| #include "mojo/shell/application_loader.h"
|
| #include "mojo/shell/application_manager.h"
|
| #include "mojo/shell/switches.h"
|
| @@ -304,15 +306,27 @@ bool Context::Init() {
|
| InitContentHandlers(&application_manager_, command_line);
|
| InitNativeOptions(&application_manager_, command_line);
|
|
|
| + ServiceProviderPtr service_provider_ptr;
|
| ServiceProviderPtr tracing_service_provider_ptr;
|
| new TracingServiceProvider(GetProxy(&tracing_service_provider_ptr));
|
| mojo::URLRequestPtr request(mojo::URLRequest::New());
|
| request->url = mojo::String::From("mojo:tracing");
|
| application_manager_.ConnectToApplication(
|
| - nullptr, request.Pass(), std::string(), GURL(""), nullptr,
|
| - tracing_service_provider_ptr.Pass(),
|
| + nullptr, request.Pass(), std::string(), GURL(),
|
| + GetProxy(&service_provider_ptr), tracing_service_provider_ptr.Pass(),
|
| shell::GetPermissiveCapabilityFilter(), base::Closure());
|
|
|
| + // Record the shell process creation time for performance testing.
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + tracing::kEnableStatsCollectionBindings)) {
|
| + tracing::StartupPerformanceDataCollectorPtr collector;
|
| + service_provider_ptr->ConnectToService(
|
| + tracing::StartupPerformanceDataCollector::Name_,
|
| + GetProxy(&collector).PassMessagePipe());
|
| + const base::Time creation_time = base::CurrentProcessInfo::CreationTime();
|
| + collector->SetShellProcessCreationTime(creation_time.ToInternalValue());
|
| + }
|
| +
|
| InitDevToolsServiceIfNeeded(&application_manager_, command_line);
|
|
|
| return true;
|
|
|