Moved the TraceUploader to chrome/ and abstracted it for alternative new upload destinations.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 68ec9e0040d15a85df8a27d7e10e6906e71db5cd..7e414239136889b3537c957cd5ca5d2c4be4761a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -74,6 +74,7 @@
 #include "chrome/browser/ssl/ssl_error_handler.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tracing/chrome_tracing_delegate.h"
 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
@@ -2592,6 +2593,14 @@ ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
 #endif
 }
 
+content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
+#if !defined(OS_ANDROID)

[dsinclair, 2015/02/12 20:57:35]

We don't allow uploading from android?

[oystein (OOO til 10th of July), 2015/02/13 17:02:45]

There didn't seem to be any point right now, since about://tracing doesn't work
on Android. I figured I'd just change the build rules when we have an
alternative way to trigger uploads here.

+  return new ChromeTracingDelegate();
+#else
+  return nullptr;
+#endif
+}
+
 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
     content::BrowserContext* browser_context,
     const GURL& url) {