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

services/native_viewport/app_delegate.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/native_viewport/app_delegate.h"
 
 #include <vector>
 
 #include "gpu/config/gpu_util.h"
 
@@ skipping 15 matching lines @@
 
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
 }
 
 void NativeViewportAppDelegate::Initialize(mojo::ApplicationImpl* application) {
   application_ = application;
 
   InitLogging(application);
-  tracing_.Initialize(application);
+  tracing_.Initialize(application->shell(), &application->args());
 
   // Apply the switch for kTouchEvents to CommandLine (if set). This allows
   // redirecting the mouse to a touch device on X for testing.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   const std::string touch_event_string("--" +
                                        std::string(switches::kTouchDevices));
   auto touch_iter = std::find(application->args().begin(),
                               application->args().end(), touch_event_string);
   if (touch_iter != application->args().end() &&
       ++touch_iter != application->args().end()) {
@@ skipping 28 matching lines @@
              mojo::InterfaceRequest<mojo::Gpu> gpu_request) {
         if (!gpu_state_.get())
           gpu_state_ = new gles2::GpuState();
         new gles2::GpuImpl(gpu_request.Pass(), gpu_state_);
       });
 
   return true;
 }
 
 }  // namespace native_viewport