Hooked the trace event argument whitelist up to the background_trace_manager

content/public/browser/background_tracing_manager.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_BACKGROUND_TRACING_MANAGER_H_
 #define CONTENT_PUBLIC_BROWSER_BACKGROUND_TRACING_MANAGER_H_
 
 #include "base/trace_event/trace_event_impl.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
@@ skipping 21 matching lines @@
   // void Upload(const base::RefCountedString* data,
   //             base::Closure done_callback) {
   //   BrowserThread::PostTaskAndReply(
   //       BrowserThread::FILE,
   //       FROM_HERE,
   //       base::Bind(&DoUploadOnFileThread, data),
   //       done_callback
   //     );
   // }
   //
-  typedef base::Callback<void(const base::RefCountedString*, base::Closure)>
-      ReceiveCallback;
+  typedef base::Callback<void(const scoped_refptr<base::RefCountedString>&,
+                              base::Closure)> ReceiveCallback;
 
   // Set the triggering rules for when to start recording.
   //
   // In preemptive mode, recording begins immediately and any calls to
   // TriggerNamedEvent() will potentially trigger the trace to finalize and get
   // uploaded to the specified upload_sink. Once the trace has been uploaded,
   // tracing will be enabled again.
   //
   // In reactive mode, recording begins when TriggerNamedEvent() is called, and
   // continues until either the next call to TriggerNamedEvent, or a timeout
   // occurs. Tracing will not be re-enabled after the trace is finalized and
   // uploaded to the upload_sink.
   //
   // Calls to SetActiveScenario() with a config will fail if tracing is
   // currently on. Use WhenIdle to register a callback to get notified when
   // the manager is idle and a config can be set again.
   virtual bool SetActiveScenario(scoped_ptr<BackgroundTracingConfig> config,
                                  const ReceiveCallback& receive_callback,
+                                 const base::Closure& enabled_callback,

[dsinclair, 2015/06/01 15:09:37]

What is this for? I see it pass around all over the place but never used. Can we
remove it until we have a CL which needs it?

[oystein (OOO til 10th of July), 2015/06/01 18:23:39]

It's used in the BackgroundTracingManagerBrowserTest.NoWhitelistedArgsStripped
browsertest added in this CL, to wait until tracing is fully enabled before we
start emitting events.

[dsinclair, 2015/06/01 18:50:05]

If it's only for testing, it's too bad we have to have it in the public API. Is
there any way we can move this to a testing only setting that we use instead?

[oystein (OOO til 10th of July), 2015/06/01 20:46:20]

Done.

                                  bool requires_anonymized_data) = 0;
 
   // Notifies the caller when the manager is idle (not recording or uploading),
   // so that a call to SetActiveScenario() is likely to succeed.
   typedef base::Callback<void()> IdleCallback;
   virtual void WhenIdle(IdleCallback idle_callback) = 0;
 
   typedef base::Callback<void(bool)> StartedFinalizingCallback;
   typedef int TriggerHandle;
 
@@ skipping 13 matching lines @@
 
   virtual void InvalidateTriggerHandlesForTesting() = 0;
 
  protected:
   virtual ~BackgroundTracingManager() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BACKGROUND_TRACING_MANAGER_H_