Changes to upload tracked_objects data from all renderer

chrome/browser/ui/webui/tracking_ui.cc

 // Copyright (c) 2011 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/tracking_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/tracked_objects.h"
+#include "chrome/browser/metrics/tracking_synchronizer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/trace_controller.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 
 using content::BrowserThread;
+using chrome_browser_metrics::TrackingSynchronizer;
 
 namespace {
 
 ChromeWebUIDataSource* CreateTrackingHTMLSource() {
   // TODO(eroman): Use kChromeUITrackingHost instead of kChromeUITrackingHost2
   //               once migration to webui is complete.
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUITrackingHost2);
 
   source->set_json_path("strings.js");
@@ skipping 31 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   web_ui_->RegisterMessageCallback("getData",
       base::Bind(&TrackingMessageHandler::OnGetData,base::Unretained(this)));
   web_ui_->RegisterMessageCallback("resetData",
       base::Bind(&TrackingMessageHandler::OnResetData,
                  base::Unretained(this)));
 }
 
 void TrackingMessageHandler::OnGetData(const ListValue* list) {
-  // Send the data to the renderer.
-  scoped_ptr<Value> data_values(tracked_objects::ThreadData::ToValue());
-  web_ui_->CallJavascriptFunction("g_browserBridge.receivedData",
-                                  *data_values.get());
+  TrackingUI* tracking_ui = reinterpret_cast<TrackingUI*>(web_ui_);
+  tracking_ui->GetData();
 }
 
 void TrackingMessageHandler::OnResetData(const ListValue* list) {
   tracked_objects::ThreadData::ResetAllThreadData();
 }
 
 }  // namespace
 
 TrackingUI::TrackingUI(TabContents* contents) : ChromeWebUI(contents) {
+  ui_weak_ptr_factory_.reset(new base::WeakPtrFactory<TrackingUI>(this));
+  ui_weak_ptr_ = ui_weak_ptr_factory_->GetWeakPtr();
+
   AddMessageHandler((new TrackingMessageHandler())->Attach(this));
 
   // Set up the chrome://tracking2/ source.
   Profile::FromBrowserContext(contents->browser_context())->
       GetChromeURLDataManager()->AddDataSource(CreateTrackingHTMLSource());
 }
+
+TrackingUI::~TrackingUI() {
+}
+
+void TrackingUI::GetData() {
+  TrackingSynchronizer::FetchTrackingDataAsynchronously(ui_weak_ptr_);
+}
+
+void TrackingUI::ReceivedData(base::Value* value) {
+  // Send the data to the renderer.
+  scoped_ptr<Value> data_values(value);
+  CallJavascriptFunction("g_browserBridge.receivedData", *data_values.get());
+}
+