Make NetLog take in callbacks that return Values

chrome/browser/ui/webui/media/media_internals_proxy.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/media/media_internals_proxy.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_internals.h"
@@ skipping 62 matching lines @@
   CallJavaScriptFunctionOnUIThread("media.onReceiveConstants", GetConstants());
 }
 
 void MediaInternalsProxy::OnUpdate(const string16& update) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&MediaInternalsProxy::UpdateUIOnUIThread, this, update));
 }
 
-void MediaInternalsProxy::OnAddEntry(net::NetLog::EventType type,
-                                     const base::TimeTicks& time,
-                                     const net::NetLog::Source& source,
-                                     net::NetLog::EventPhase phase,
-                                     net::NetLog::EventParameters* params) {
+void MediaInternalsProxy::OnAddEntry(const net::NetLog::Entry& entry) {
   bool is_event_interesting = false;
   for (size_t i = 0; i < arraysize(kNetEventTypeFilter); i++) {
-    if (type == kNetEventTypeFilter[i]) {
+    if (entry.type() == kNetEventTypeFilter[i]) {
       is_event_interesting = true;
       break;
     }
   }
 
   if (!is_event_interesting)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&MediaInternalsProxy::AddNetEventOnUIThread, this,
-          net::NetLog::EntryToDictionaryValue(type, time, source, phase,
-                                              params, false)));
+                 base::Owned(entry.ToValue())));

[eroman, 2012/06/06 21:27:11]

IMPORTANT: You sure about this? Looks like ownership is already being handled by
it internally, I think this will lead to a double-free

[mmenke, 2012/06/07 19:20:46]

You're right.  I was thinking of it as one of the new logging callbacks, for
some reason.

 }
 
 MediaInternalsProxy::~MediaInternalsProxy() {}
 
 Value* MediaInternalsProxy::GetConstants() {
   DictionaryValue* event_phases = new DictionaryValue();
   event_phases->SetInteger(
       net::NetLog::EventPhaseToString(net::NetLog::PHASE_NONE),
       net::NetLog::PHASE_NONE);
   event_phases->SetInteger(
@@ skipping 60 matching lines @@
 
 void MediaInternalsProxy::CallJavaScriptFunctionOnUIThread(
     const std::string& function, Value* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_ptr<Value> args_value(args);
   std::vector<const Value*> args_vector;
   args_vector.push_back(args_value.get());
   string16 update = content::WebUI::GetJavascriptCall(function, args_vector);
   UpdateUIOnUIThread(update);
 }