Make TracingImpl take a Shell* and args, instead of an ApplicationImpl*.

services/java_handler/java_handler.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 "services/java_handler/java_handler.h"
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 72 matching lines @@
   ScopedJavaLocalRef<jstring> j_archive_path =
       ConvertUTF8ToJavaString(env, archive_path.value());
   ScopedJavaLocalRef<jstring> j_cache_dir =
       ConvertUTF8ToJavaString(env, cache_dir.value());
   Java_JavaHandler_bootstrap(
       env, context, j_archive_path.obj(), j_cache_dir.obj(),
       application_request.PassMessagePipe().release().value());
 }
 
 void JavaHandler::Initialize(mojo::ApplicationImpl* app) {
-  tracing_.Initialize(app);
+  tracing_.Initialize(app->shell(), &app->args());
   handler_task_runner_ = base::MessageLoop::current()->task_runner();
   mojo::ConnectToService(app->shell(), "mojo:url_response_disk_cache",
                          GetProxy(&url_response_disk_cache_));
 }
 
 void JavaHandler::GetApplication(base::FilePath* archive_path,
                                  base::FilePath* cache_dir,
                                  mojo::URLResponsePtr response,
                                  const base::Closure& callback) {
   url_response_disk_cache_->UpdateAndGet(
@@ skipping 49 matching lines @@
   return JNI_VERSION_1_4;
 }
 
 // This is needed because the application needs to access the application
 // context.
 extern "C" JNI_EXPORT void InitApplicationContext(
     const base::android::JavaRef<jobject>& context) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::InitApplicationContext(env, context);
 }