Revert 180055: Very likely caused http://crbug.com/173885

> Moving chrome://tracing to content.
> 
> BUG=169170
> Review URL: https://codereview.chromium.org/12088099

TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/12194007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180282 0039d316-1c4b-4281-b951-d872f2087c98

26 files changed, 64 insertions, 982 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 42bfea7..66c1d00 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -15446,6 +15446,11 @@ Some features may be unavailable.  Please check that the profile exists and you
       Remove desktop shortcut for this user
     </message>
 
+    <!-- Tracing about page strings -->
+    <message name="IDS_TRACING_TITLE" desc="Title for the about:tracing page.">
+      Tracing
+    </message>
+
     <!-- Aura strings -->
     <if expr="pp_ifdef('use_ash')">
       <message name="IDS_LAUNCHER_CONTEXT_MENU_NEW_TAB" desc="Title text for the 'open new' context menu item of the launcher for apps configured to open in a tab">
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index dabd5a3..9f268a9 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -211,6 +211,8 @@
         <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions_internals\suggestions_internals.js" type="BINDATA" />
         <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_page.css" type="BINDATA" />
         <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions_page.js" type="BINDATA" />
+        <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\src\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+        <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\about_tracing.js" flattenhtml="true" type="BINDATA" />
       </if>
       <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" />
       <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 78e9939..32320df 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -71,7 +71,6 @@
 #include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/toolkit_extra_parts.h"
-#include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
@@ -1937,11 +1936,6 @@ FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() {
   return directory.Append(FILE_PATH_LITERAL("Hyphen"));
 }
 
-ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy(
-    WebContents* web_contents) {
-  return new ChromeSelectFilePolicy(web_contents);
-}
-
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const CommandLine& command_line,
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 9f2ecc6..d9138b2 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -208,8 +208,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       const GURL& url,
       const content::SocketPermissionRequest& params) OVERRIDE;
   virtual FilePath GetHyphenDictionaryDirectory() OVERRIDE;
-  virtual ui::SelectFilePolicy* CreateSelectFilePolicy(
-      content::WebContents* web_contents) OVERRIDE;
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   virtual void GetAdditionalMappedFilesForChildProcess(
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index b83e691..8623084 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -45,6 +45,7 @@
 #include "chrome/browser/ui/webui/quota_internals_ui.h"
 #include "chrome/browser/ui/webui/signin_internals_ui.h"
 #include "chrome/browser/ui/webui/sync_internals_ui.h"
+#include "chrome/browser/ui/webui/tracing_ui.h"
 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
 #include "chrome/browser/ui/webui/version_ui.h"
 #include "chrome/common/chrome_switches.h"
@@ -284,6 +285,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<options::OptionsUI>;
   if (url.host() == chrome::kChromeUISuggestionsInternalsHost)
     return &NewWebUI<SuggestionsInternalsUI>;
+  if (url.host() == chrome::kChromeUITracingHost)
+    return &NewWebUI<TracingUI>;
   // Uber frame is not used on Android.
   if (url.host() == chrome::kChromeUIUberFrameHost)
     return &NewWebUI<UberFrameUI>;
diff --git a/content/browser/tracing/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc
index ff1f1ec..cd7010f 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/chrome/browser/ui/webui/tracing_ui.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/tracing/tracing_ui.h"
+#include "chrome/browser/ui/webui/tracing_ui.h"
 
 #include <string>
 
@@ -16,8 +16,11 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/trace_controller.h"
 #include "content/public/browser/trace_subscriber.h"
@@ -26,9 +29,10 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
-#include "content/public/common/url_constants.h"
-#include "grit/content_resources.h"
+#include "grit/browser_resources.h"
+#include "grit/generated_resources.h"
 #include "ipc/ipc_channel.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 #if defined(OS_CHROMEOS)
@@ -36,12 +40,16 @@
 #include "chromeos/dbus/debug_daemon_client.h"
 #endif
 
-namespace content {
+using content::BrowserThread;
+using content::TraceController;
+using content::WebContents;
+using content::WebUIMessageHandler;
+
 namespace {
 
-WebUIDataSource* CreateTracingHTMLSource() {
-  WebUIDataSource* source =
-      WebUIDataSource::Create(chrome::kChromeUITracingHost);
+content::WebUIDataSource* CreateTracingHTMLSource() {
+  content::WebUIDataSource* source =
+      content::WebUIDataSource::Create(chrome::kChromeUITracingHost);
 
   source->SetJsonPath("strings.js");
   source->SetDefaultResource(IDR_TRACING_HTML);
@@ -57,7 +65,7 @@ class TracingMessageHandler
     : public WebUIMessageHandler,
       public ui::SelectFileDialog::Listener,
       public base::SupportsWeakPtr<TracingMessageHandler>,
-      public TraceSubscriber {
+      public content::TraceSubscriber {
  public:
   TracingMessageHandler();
   virtual ~TracingMessageHandler();
@@ -196,10 +204,25 @@ void TracingMessageHandler::OnTracingControllerInitialized(
   // Send the client info to the tracingController
   {
     scoped_ptr<DictionaryValue> dict(new DictionaryValue());
-    dict->SetString("version", GetContentClient()->GetProduct());
-
-    dict->SetString("command_line",
-        CommandLine::ForCurrentProcess()->GetCommandLineString());
+    chrome::VersionInfo version_info;
+
+    if (!version_info.is_valid()) {
+      DLOG(ERROR) << "Unable to create chrome::VersionInfo";
+    } else {
+      // We have everything we need to send the right values.
+      dict->SetString("version", version_info.Version());
+      dict->SetString("cl", version_info.LastChange());
+      dict->SetString("version_mod",
+          chrome::VersionInfo::GetVersionStringModifier());
+      dict->SetString("official",
+          l10n_util::GetStringUTF16(
+              version_info.IsOfficialBuild() ?
+              IDS_ABOUT_VERSION_OFFICIAL :
+              IDS_ABOUT_VERSION_UNOFFICIAL));
+
+      dict->SetString("command_line",
+          CommandLine::ForCurrentProcess()->GetCommandLineString());
+    }
 
     web_ui()->CallJavascriptFunction("tracingController.onClientInfoUpdate",
                                      *dict);
@@ -303,9 +326,7 @@ void TracingMessageHandler::OnLoadTraceFile(const ListValue* list) {
     return;
   select_trace_file_dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE;
   select_trace_file_dialog_ = ui::SelectFileDialog::Create(
-      this,
-      GetContentClient()->browser()->CreateSelectFilePolicy(
-          web_ui()->GetWebContents()));
+      this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
   select_trace_file_dialog_->SelectFile(
       ui::SelectFileDialog::SELECT_OPEN_FILE,
       string16(),
@@ -328,7 +349,8 @@ void TracingMessageHandler::LoadTraceFileComplete(string16* contents) {
   string16 prefix = UTF8ToUTF16("window.traceData += '");
   string16 suffix = UTF8ToUTF16("';");
 
-  RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
+  content::RenderViewHost* rvh =
+      web_ui()->GetWebContents()->GetRenderViewHost();
   for (size_t i = 0; i < contents->size(); i += kMaxSize) {
     string16 javascript = i == 0 ? first_prefix : prefix;
     javascript += contents->substr(i, kMaxSize) + suffix;
@@ -353,9 +375,7 @@ void TracingMessageHandler::OnSaveTraceFile(const ListValue* list) {
 
   select_trace_file_dialog_type_ = ui::SelectFileDialog::SELECT_SAVEAS_FILE;
   select_trace_file_dialog_ = ui::SelectFileDialog::Create(
-      this,
-      GetContentClient()->browser()->CreateSelectFilePolicy(
-          web_ui()->GetWebContents()));
+      this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
   select_trace_file_dialog_->SelectFile(
       ui::SelectFileDialog::SELECT_SAVEAS_FILE,
       string16(),
@@ -480,13 +500,10 @@ void TracingMessageHandler::OnTraceBufferPercentFullReply(float percent_full) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-TracingUI::TracingUI(WebUI* web_ui) : WebUIController(web_ui) {
+TracingUI::TracingUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new TracingMessageHandler());
 
   // Set up the chrome://tracing/ source.
-  BrowserContext* browser_context =
-      web_ui->GetWebContents()->GetBrowserContext();
-  WebUIDataSource::Add(browser_context, CreateTracingHTMLSource());
+  Profile* profile = Profile::FromWebUI(web_ui);
+  content::WebUIDataSource::Add(profile, CreateTracingHTMLSource());
 }
-
-}  // namespace content
diff --git a/content/browser/tracing/tracing_ui.h b/chrome/browser/ui/webui/tracing_ui.h
index 85bbce1..7b7230a 100644
--- a/content/browser/tracing/tracing_ui.h
+++ b/chrome/browser/ui/webui/tracing_ui.h
@@ -2,22 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TRACING_UI_H_
-#define CONTENT_BROWSER_TRACING_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_TRACING_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_TRACING_UI_H_
 
 #include "content/public/browser/web_ui_controller.h"
 
-namespace content {
-
 // The C++ back-end for the chrome://tracing webui page.
-class TracingUI : public WebUIController {
+class TracingUI : public content::WebUIController {
  public:
-  explicit TracingUI(WebUI* web_ui);
+  explicit TracingUI(content::WebUI* web_ui);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TracingUI);
 };
 
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_TRACING_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_TRACING_UI_H_
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index aeeb4c1..9f5aa7d 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2139,6 +2139,8 @@
         'browser/ui/webui/task_manager/task_manager_ui.h',
         'browser/ui/webui/theme_source.cc',
         'browser/ui/webui/theme_source.h',
+        'browser/ui/webui/tracing_ui.cc',
+        'browser/ui/webui/tracing_ui.h',
         'browser/ui/webui/uber/uber_ui.cc',
         'browser/ui/webui/uber/uber_ui.h',
         'browser/ui/webui/user_actions/user_actions_ui.cc',
@@ -2597,6 +2599,8 @@
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui.h',
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.cc',
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.h',
+            'browser/ui/webui/tracing_ui.cc',
+            'browser/ui/webui/tracing_ui.h',
             'browser/ui/window_sizer/window_sizer.cc',
             'browser/ui/window_sizer/window_sizer.h',
           ],
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 799e847..fbde635 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -195,6 +195,7 @@ const char kChromeUITermsHost[] = "terms";
 const char kChromeUIThemeHost[] = "theme";
 const char kChromeUIThumbnailHost[] = "thumb";
 const char kChromeUITouchIconHost[] = "touch-icon";
+const char kChromeUITracingHost[] = "tracing";
 const char kChromeUIUberFrameHost[] = "uber-frame";
 const char kChromeUIUberHost[] = "chrome";
 const char kChromeUIUserActionsHost[] = "user-actions";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index d80fc5a..c509fbb 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -190,6 +190,7 @@ extern const char kChromeUITermsHost[];
 extern const char kChromeUIThemeHost[];
 extern const char kChromeUIThumbnailHost[];
 extern const char kChromeUITouchIconHost[];
+extern const char kChromeUITracingHost[];
 extern const char kChromeUIUberFrameHost[];
 extern const char kChromeUIUberHost[];
 extern const char kChromeUIUserActionsHost[];
diff --git a/content/browser/tracing/OWNERS b/content/browser/tracing/OWNERS
deleted file mode 100644
index 93d1471..0000000
--- a/content/browser/tracing/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-nduca@chromium.org
diff --git a/content/browser/tracing/trace_controller_impl.cc b/content/browser/tracing/trace_controller_impl.cc
deleted file mode 100644
index 40a3f56..0000000
--- a/content/browser/tracing/trace_controller_impl.cc
+++ /dev/null
@@ -1,414 +0,0 @@
-// 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 "content/browser/tracing/trace_controller_impl.h"
-
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/debug/trace_event.h"
-#include "base/string_number_conversions.h"
-#include "content/browser/tracing/trace_message_filter.h"
-#include "content/browser/tracing/trace_subscriber_stdio.h"
-#include "content/common/child_process_messages.h"
-#include "content/public/browser/browser_message_filter.h"
-#include "content/public/common/content_switches.h"
-
-using base::debug::TraceLog;
-
-namespace content {
-
-namespace {
-
-base::LazyInstance<TraceControllerImpl>::Leaky g_controller =
-    LAZY_INSTANCE_INITIALIZER;
-
-class AutoStopTraceSubscriberStdio : public TraceSubscriberStdio {
- public:
-  AutoStopTraceSubscriberStdio(const FilePath& file_path)
-      : TraceSubscriberStdio(file_path) {}
-
-  static void EndStartupTrace(TraceSubscriberStdio* subscriber) {
-    if (!TraceControllerImpl::GetInstance()->EndTracingAsync(subscriber))
-      delete subscriber;
-    // else, the tracing will end asynchronously in OnEndTracingComplete().
-  }
-
-  virtual void OnEndTracingComplete() {
-    TraceSubscriberStdio::OnEndTracingComplete();
-    delete this;
-    // TODO(joth): this would be the time to automatically open up
-    // chrome://tracing/ and load up the trace data collected.
-  }
-};
-
-}  // namespace
-
-TraceController* TraceController::GetInstance() {
-  return TraceControllerImpl::GetInstance();
-}
-
-TraceControllerImpl::TraceControllerImpl() :
-    subscriber_(NULL),
-    pending_end_ack_count_(0),
-    pending_bpf_ack_count_(0),
-    maximum_bpf_(0.0f),
-    is_tracing_(false),
-    is_get_categories_(false) {
-  TraceLog::GetInstance()->SetNotificationCallback(
-      base::Bind(&TraceControllerImpl::OnTraceNotification,
-                 base::Unretained(this)));
-}
-
-TraceControllerImpl::~TraceControllerImpl() {
-  // No need to SetNotificationCallback(nil) on the TraceLog since this is a
-  // Leaky instance.
-  NOTREACHED();
-}
-
-TraceControllerImpl* TraceControllerImpl::GetInstance() {
-  return g_controller.Pointer();
-}
-
-void TraceControllerImpl::InitStartupTracing(const CommandLine& command_line) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  FilePath trace_file = command_line.GetSwitchValuePath(
-      switches::kTraceStartupFile);
-  // trace_file = "none" means that startup events will show up for the next
-  // begin/end tracing (via about:tracing or AutomationProxy::BeginTracing/
-  // EndTracing, for example).
-  if (trace_file == FilePath().AppendASCII("none"))
-    return;
-
-  if (trace_file.empty()) {
-    // Default to saving the startup trace into the current dir.
-    trace_file = FilePath().AppendASCII("chrometrace.log");
-  }
-  scoped_ptr<AutoStopTraceSubscriberStdio> subscriber(
-      new AutoStopTraceSubscriberStdio(trace_file));
-  DCHECK(can_begin_tracing(subscriber.get()));
-
-  std::string delay_str = command_line.GetSwitchValueASCII(
-      switches::kTraceStartupDuration);
-  int delay_secs = 5;
-  if (!delay_str.empty() && !base::StringToInt(delay_str, &delay_secs)) {
-    DLOG(WARNING) << "Could not parse --" << switches::kTraceStartupDuration
-        << "=" << delay_str << " defaulting to 5 (secs)";
-    delay_secs = 5;
-  }
-
-  OnTracingBegan(subscriber.get());
-  BrowserThread::PostDelayedTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&AutoStopTraceSubscriberStdio::EndStartupTrace,
-                 base::Unretained(subscriber.release())),
-      base::TimeDelta::FromSeconds(delay_secs));
-}
-
-bool TraceControllerImpl::GetKnownCategoriesAsync(TraceSubscriber* subscriber) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // Known categories come back from child processes with the EndTracingAck
-  // message. So to get known categories, just begin and end tracing immediately
-  // afterwards. This will ping all the child processes for categories.
-  is_get_categories_ = true;
-  bool success = BeginTracing(subscriber, "*") &&
-                 EndTracingAsync(subscriber);
-  is_get_categories_ = success;
-  return success;
-}
-
-bool TraceControllerImpl::BeginTracing(
-    TraceSubscriber* subscriber,
-    const std::vector<std::string>& included_categories,
-    const std::vector<std::string>& excluded_categories) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (!can_begin_tracing(subscriber))
-    return false;
-
-  // Enable tracing
-  TraceLog::GetInstance()->SetEnabled(included_categories, excluded_categories);
-  OnTracingBegan(subscriber);
-
-  return true;
-}
-
-bool TraceControllerImpl::BeginTracing(TraceSubscriber* subscriber,
-                                       const std::string& categories) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (!can_begin_tracing(subscriber))
-    return false;
-
-  // Enable tracing
-  TraceLog::GetInstance()->SetEnabled(categories);
-
-  OnTracingBegan(subscriber);
-
-  return true;
-}
-
-bool TraceControllerImpl::EndTracingAsync(TraceSubscriber* subscriber) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (!can_end_tracing() || subscriber != subscriber_)
-    return false;
-
-  // There could be a case where there are no child processes and filters_
-  // is empty. In that case we can immediately tell the subscriber that tracing
-  // has ended. To avoid recursive calls back to the subscriber, we will just
-  // use the existing asynchronous OnEndTracingAck code.
-  // Count myself (local trace) in pending_end_ack_count_, acked below.
-  pending_end_ack_count_ = filters_.size() + 1;
-
-  // Handle special case of zero child processes.
-  if (pending_end_ack_count_ == 1) {
-    // Ack asynchronously now, because we don't have any children to wait for.
-    std::vector<std::string> categories;
-    TraceLog::GetInstance()->GetKnownCategories(&categories);
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnEndTracingAck,
-                   base::Unretained(this), categories));
-  }
-
-  // Notify all child processes.
-  for (FilterMap::iterator it = filters_.begin(); it != filters_.end(); ++it) {
-    it->get()->SendEndTracing();
-  }
-
-  return true;
-}
-
-bool TraceControllerImpl::GetTraceBufferPercentFullAsync(
-    TraceSubscriber* subscriber) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (!can_get_buffer_percent_full() || subscriber != subscriber_)
-    return false;
-
-  maximum_bpf_ = 0.0f;
-  pending_bpf_ack_count_ = filters_.size() + 1;
-
-  // Handle special case of zero child processes.
-  if (pending_bpf_ack_count_ == 1) {
-    // Ack asynchronously now, because we don't have any children to wait for.
-    float bpf = TraceLog::GetInstance()->GetBufferPercentFull();
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnTraceBufferPercentFullReply,
-                   base::Unretained(this), bpf));
-  }
-
-  // Message all child processes.
-  for (FilterMap::iterator it = filters_.begin(); it != filters_.end(); ++it) {
-    it->get()->SendGetTraceBufferPercentFull();
-  }
-
-  return true;
-}
-
-bool TraceControllerImpl::SetWatchEvent(TraceSubscriber* subscriber,
-                                        const std::string& category_name,
-                                        const std::string& event_name) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (subscriber != subscriber_)
-    return false;
-
-  watch_category_ = category_name;
-  watch_name_ = event_name;
-
-  TraceLog::GetInstance()->SetWatchEvent(category_name, event_name);
-  for (FilterMap::iterator it = filters_.begin(); it != filters_.end(); ++it)
-    it->get()->SendSetWatchEvent(category_name, event_name);
-
-  return true;
-}
-
-bool TraceControllerImpl::CancelWatchEvent(TraceSubscriber* subscriber) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (subscriber != subscriber_)
-    return false;
-
-  watch_category_.clear();
-  watch_name_.clear();
-
-  TraceLog::GetInstance()->CancelWatchEvent();
-  for (FilterMap::iterator it = filters_.begin(); it != filters_.end(); ++it)
-    it->get()->SendCancelWatchEvent();
-
-  return true;
-}
-
-void TraceControllerImpl::CancelSubscriber(TraceSubscriber* subscriber) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (subscriber == subscriber_) {
-    subscriber_ = NULL;
-    // End tracing if necessary.
-    if (is_tracing_ && pending_end_ack_count_ == 0)
-      EndTracingAsync(NULL);
-  }
-}
-
-void TraceControllerImpl::AddFilter(TraceMessageFilter* filter) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::AddFilter, base::Unretained(this),
-                   make_scoped_refptr(filter)));
-    return;
-  }
-
-  filters_.insert(filter);
-  if (is_tracing_enabled()) {
-    filter->SendBeginTracing(included_categories_, excluded_categories_);
-    if (!watch_category_.empty())
-      filter->SendSetWatchEvent(watch_category_, watch_name_);
-  }
-}
-
-void TraceControllerImpl::RemoveFilter(TraceMessageFilter* filter) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::RemoveFilter, base::Unretained(this),
-                   make_scoped_refptr(filter)));
-    return;
-  }
-
-  filters_.erase(filter);
-}
-
-void TraceControllerImpl::OnTracingBegan(TraceSubscriber* subscriber) {
-  is_tracing_ = true;
-
-  subscriber_ = subscriber;
-
-  TraceLog::GetInstance()->GetEnabledTraceCategories(&included_categories_,
-                                                     &excluded_categories_);
-  // Notify all child processes.
-  for (FilterMap::iterator it = filters_.begin(); it != filters_.end(); ++it) {
-    it->get()->SendBeginTracing(included_categories_, excluded_categories_);
-  }
-}
-
-void TraceControllerImpl::OnEndTracingAck(
-    const std::vector<std::string>& known_categories) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnEndTracingAck,
-                   base::Unretained(this), known_categories));
-    return;
-  }
-
-  // Merge known_categories with known_categories_
-  known_categories_.insert(known_categories.begin(), known_categories.end());
-
-  if (pending_end_ack_count_ == 0)
-    return;
-
-  if (--pending_end_ack_count_ == 0) {
-    // All acks have been received.
-    is_tracing_ = false;
-
-    // Disable local trace.
-    TraceLog::GetInstance()->SetDisabled();
-
-    // During this call, our OnTraceDataCollected will be
-    // called with the last of the local trace data. Since we are on the UI
-    // thread, the call to OnTraceDataCollected will be synchronous, so we can
-    // immediately call OnEndTracingComplete below.
-    TraceLog::GetInstance()->Flush(
-        base::Bind(&TraceControllerImpl::OnTraceDataCollected,
-                   base::Unretained(this)));
-
-    // Trigger callback if one is set.
-    if (subscriber_) {
-      if (is_get_categories_)
-        subscriber_->OnKnownCategoriesCollected(known_categories_);
-      else
-        subscriber_->OnEndTracingComplete();
-      // Clear subscriber so that others can use TraceController.
-      subscriber_ = NULL;
-    }
-
-    is_get_categories_ = false;
-  }
-
-  if (pending_end_ack_count_ == 1) {
-    // The last ack represents local trace, so we need to ack it now. Note that
-    // this code only executes if there were child processes.
-    std::vector<std::string> categories;
-    TraceLog::GetInstance()->GetKnownCategories(&categories);
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnEndTracingAck,
-                   base::Unretained(this), categories));
-  }
-}
-
-void TraceControllerImpl::OnTraceDataCollected(
-    const scoped_refptr<base::RefCountedString>& events_str_ptr) {
-  // OnTraceDataCollected may be called from any browser thread, either by the
-  // local event trace system or from child processes via TraceMessageFilter.
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnTraceDataCollected,
-                   base::Unretained(this), events_str_ptr));
-    return;
-  }
-
-  // Drop trace events if we are just getting categories.
-  if (subscriber_ && !is_get_categories_)
-    subscriber_->OnTraceDataCollected(events_str_ptr);
-}
-
-void TraceControllerImpl::OnTraceNotification(int notification) {
-  // OnTraceNotification may be called from any browser thread, either by the
-  // local event trace system or from child processes via TraceMessageFilter.
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnTraceNotification,
-                   base::Unretained(this), notification));
-    return;
-  }
-
-  if (notification & base::debug::TraceLog::TRACE_BUFFER_FULL) {
-    // EndTracingAsync may return false if tracing is already in the process
-    // of being ended. That is ok.
-    EndTracingAsync(subscriber_);
-  }
-  if (notification & base::debug::TraceLog::EVENT_WATCH_NOTIFICATION) {
-    if (subscriber_)
-      subscriber_->OnEventWatchNotification();
-  }
-}
-
-void TraceControllerImpl::OnTraceBufferPercentFullReply(float percent_full) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnTraceBufferPercentFullReply,
-                   base::Unretained(this), percent_full));
-    return;
-  }
-
-  if (pending_bpf_ack_count_ == 0)
-    return;
-
-  maximum_bpf_ = (maximum_bpf_ > percent_full)? maximum_bpf_ : percent_full;
-
-  if (--pending_bpf_ack_count_ == 0) {
-    // Trigger callback if one is set.
-    if (subscriber_)
-      subscriber_->OnTraceBufferPercentFullReply(maximum_bpf_);
-  }
-
-  if (pending_bpf_ack_count_ == 1) {
-    // The last ack represents local trace, so we need to ack it now. Note that
-    // this code only executes if there were child processes.
-    float bpf = TraceLog::GetInstance()->GetBufferPercentFull();
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TraceControllerImpl::OnTraceBufferPercentFullReply,
-                   base::Unretained(this), bpf));
-  }
-}
-
-}  // namespace content
diff --git a/content/browser/tracing/trace_controller_impl.h b/content/browser/tracing/trace_controller_impl.h
deleted file mode 100644
index 501f561..0000000
--- a/content/browser/tracing/trace_controller_impl.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// 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.
-
-#ifndef CONTENT_BROWSER_TRACING_TRACE_CONTROLLER_IMPL_H_
-#define CONTENT_BROWSER_TRACING_TRACE_CONTROLLER_IMPL_H_
-
-#include <set>
-#include <string>
-#include <vector>
-
-#include "base/debug/trace_event.h"
-#include "base/lazy_instance.h"
-#include "content/public/browser/trace_controller.h"
-
-class CommandLine;
-
-namespace content {
-class TraceMessageFilter;
-
-class TraceControllerImpl : public TraceController {
- public:
-  static TraceControllerImpl* GetInstance();
-
-  // Called on the main thread of the browser process to initialize
-  // startup tracing.
-  void InitStartupTracing(const CommandLine& command_line);
-
-  // Get set of known categories. This can change as new code paths are reached.
-  // If true is returned, subscriber->OnKnownCategoriesCollected will be called
-  // once the categories are retrieved from child processes.
-  bool GetKnownCategoriesAsync(TraceSubscriber* subscriber);
-
-  // Same as above, but specifies which categories to trace.
-  // If both included_categories and excluded_categories are empty,
-  //   all categories are traced.
-  // Else if included_categories is non-empty, only those are traced.
-  // Else if excluded_categories is non-empty, everything but those are traced.
-  bool BeginTracing(TraceSubscriber* subscriber,
-                    const std::vector<std::string>& included_categories,
-                    const std::vector<std::string>& excluded_categories);
-
-  // TraceController implementation:
-  virtual bool BeginTracing(TraceSubscriber* subscriber,
-                            const std::string& categories) OVERRIDE;
-  virtual  bool EndTracingAsync(TraceSubscriber* subscriber) OVERRIDE;
-  virtual bool GetTraceBufferPercentFullAsync(
-      TraceSubscriber* subscriber) OVERRIDE;
-  virtual bool SetWatchEvent(TraceSubscriber* subscriber,
-                             const std::string& category_name,
-                             const std::string& event_name) OVERRIDE;
-  virtual bool CancelWatchEvent(TraceSubscriber* subscriber) OVERRIDE;
-  virtual void CancelSubscriber(TraceSubscriber* subscriber) OVERRIDE;
-
- private:
-  typedef std::set<scoped_refptr<TraceMessageFilter> > FilterMap;
-
-  friend struct base::DefaultLazyInstanceTraits<TraceControllerImpl>;
-  friend class TraceMessageFilter;
-
-  TraceControllerImpl();
-  virtual ~TraceControllerImpl();
-
-  bool is_tracing_enabled() const {
-    return can_end_tracing();
-  }
-
-  bool can_end_tracing() const {
-    return is_tracing_ && pending_end_ack_count_ == 0;
-  }
-
-  // Can get Buffer Percent Full
-  bool can_get_buffer_percent_full() const {
-    return is_tracing_ &&
-        pending_end_ack_count_ == 0 &&
-        pending_bpf_ack_count_ == 0;
-  }
-
-  bool can_begin_tracing(TraceSubscriber* subscriber) const {
-    return !is_tracing_ &&
-        (subscriber_ == NULL || subscriber == subscriber_);
-  }
-
-  // Methods for use by TraceMessageFilter.
-
-  void AddFilter(TraceMessageFilter* filter);
-  void RemoveFilter(TraceMessageFilter* filter);
-  void OnTracingBegan(TraceSubscriber* subscriber);
-  void OnEndTracingAck(const std::vector<std::string>& known_categories);
-  void OnTraceDataCollected(
-      const scoped_refptr<base::RefCountedString>& events_str_ptr);
-  void OnTraceNotification(int notification);
-  void OnTraceBufferPercentFullReply(float percent_full);
-
-  FilterMap filters_;
-  TraceSubscriber* subscriber_;
-  // Pending acks for EndTracingAsync:
-  int pending_end_ack_count_;
-  // Pending acks for GetTraceBufferPercentFullAsync:
-  int pending_bpf_ack_count_;
-  float maximum_bpf_;
-  bool is_tracing_;
-  bool is_get_categories_;
-  std::set<std::string> known_categories_;
-  std::vector<std::string> included_categories_;
-  std::vector<std::string> excluded_categories_;
-  std::string watch_category_;
-  std::string watch_name_;
-
-  DISALLOW_COPY_AND_ASSIGN(TraceControllerImpl);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_TRACING_TRACE_CONTROLLER_IMPL_H_
diff --git a/content/browser/tracing/trace_message_filter.cc b/content/browser/tracing/trace_message_filter.cc
deleted file mode 100644
index de5b2fd..0000000
--- a/content/browser/tracing/trace_message_filter.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-// 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 "content/browser/tracing/trace_message_filter.h"
-
-#include "components/tracing/tracing_messages.h"
-#include "content/browser/tracing/trace_controller_impl.h"
-
-namespace content {
-
-TraceMessageFilter::TraceMessageFilter() :
-    has_child_(false),
-    is_awaiting_end_ack_(false),
-    is_awaiting_buffer_percent_full_ack_(false) {
-}
-
-void TraceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
-  // Always on IO thread (BrowserMessageFilter guarantee).
-  BrowserMessageFilter::OnFilterAdded(channel);
-}
-
-void TraceMessageFilter::OnChannelClosing() {
-  // Always on IO thread (BrowserMessageFilter guarantee).
-  BrowserMessageFilter::OnChannelClosing();
-
-  if (has_child_) {
-    if (is_awaiting_end_ack_)
-      OnEndTracingAck(std::vector<std::string>());
-
-    if (is_awaiting_buffer_percent_full_ack_)
-      OnTraceBufferPercentFullReply(0.0f);
-
-    TraceControllerImpl::GetInstance()->RemoveFilter(this);
-  }
-}
-
-bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message,
-                                           bool* message_was_ok) {
-  // Always on IO thread (BrowserMessageFilter guarantee).
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP_EX(TraceMessageFilter, message, *message_was_ok)
-    IPC_MESSAGE_HANDLER(TracingHostMsg_ChildSupportsTracing,
-                        OnChildSupportsTracing)
-    IPC_MESSAGE_HANDLER(TracingHostMsg_EndTracingAck, OnEndTracingAck)
-    IPC_MESSAGE_HANDLER(TracingHostMsg_TraceDataCollected,
-                        OnTraceDataCollected)
-    IPC_MESSAGE_HANDLER(TracingHostMsg_TraceNotification,
-                        OnTraceNotification)
-    IPC_MESSAGE_HANDLER(TracingHostMsg_TraceBufferPercentFullReply,
-                        OnTraceBufferPercentFullReply)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP_EX()
-  return handled;
-}
-
-void TraceMessageFilter::SendBeginTracing(
-    const std::vector<std::string>& included_categories,
-    const std::vector<std::string>& excluded_categories) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  Send(new TracingMsg_BeginTracing(included_categories,
-                                   excluded_categories,
-                                   base::TimeTicks::NowFromSystemTraceTime()));
-}
-
-void TraceMessageFilter::SendEndTracing() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!is_awaiting_end_ack_);
-  is_awaiting_end_ack_ = true;
-  Send(new TracingMsg_EndTracing);
-}
-
-void TraceMessageFilter::SendGetTraceBufferPercentFull() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!is_awaiting_buffer_percent_full_ack_);
-  is_awaiting_buffer_percent_full_ack_ = true;
-  Send(new TracingMsg_GetTraceBufferPercentFull);
-}
-
-void TraceMessageFilter::SendSetWatchEvent(const std::string& category_name,
-                                           const std::string& event_name) {
-  Send(new TracingMsg_SetWatchEvent(category_name, event_name));
-}
-
-void TraceMessageFilter::SendCancelWatchEvent() {
-  Send(new TracingMsg_CancelWatchEvent);
-}
-
-TraceMessageFilter::~TraceMessageFilter() {}
-
-void TraceMessageFilter::OnChildSupportsTracing() {
-  has_child_ = true;
-  TraceControllerImpl::GetInstance()->AddFilter(this);
-}
-
-void TraceMessageFilter::OnEndTracingAck(
-    const std::vector<std::string>& known_categories) {
-  // is_awaiting_end_ack_ should always be true here, but check in case the
-  // child process is compromised.
-  if (is_awaiting_end_ack_) {
-    is_awaiting_end_ack_ = false;
-    TraceControllerImpl::GetInstance()->OnEndTracingAck(known_categories);
-  } else {
-    NOTREACHED();
-  }
-}
-
-void TraceMessageFilter::OnTraceDataCollected(const std::string& data) {
-  scoped_refptr<base::RefCountedString> data_ptr(new base::RefCountedString());
-  data_ptr->data() = data;
-  TraceControllerImpl::GetInstance()->OnTraceDataCollected(data_ptr);
-}
-
-void TraceMessageFilter::OnTraceNotification(int notification) {
-  TraceControllerImpl::GetInstance()->OnTraceNotification(notification);
-}
-
-void TraceMessageFilter::OnTraceBufferPercentFullReply(float percent_full) {
-  if (is_awaiting_buffer_percent_full_ack_) {
-    is_awaiting_buffer_percent_full_ack_ = false;
-    TraceControllerImpl::GetInstance()->OnTraceBufferPercentFullReply(
-        percent_full);
-  } else {
-    NOTREACHED();
-  }
-}
-
-}  // namespace content
diff --git a/content/browser/tracing/trace_message_filter.h b/content/browser/tracing/trace_message_filter.h
deleted file mode 100644
index ae6d571..0000000
--- a/content/browser/tracing/trace_message_filter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.
-
-#ifndef CONTENT_BROWSER_TRACING_TRACE_MESSAGE_FILTER_H_
-#define CONTENT_BROWSER_TRACING_TRACE_MESSAGE_FILTER_H_
-
-#include <string>
-#include <vector>
-
-#include "content/public/browser/browser_message_filter.h"
-
-namespace content {
-
-// This class sends and receives trace messages on the browser process.
-// See also: trace_controller.h
-// See also: child_trace_message_filter.h
-class TraceMessageFilter : public BrowserMessageFilter {
- public:
-  TraceMessageFilter();
-
-  // BrowserMessageFilter override.
-  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
-
-  // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok) OVERRIDE;
-
-  void SendBeginTracing(const std::vector<std::string>& included_categories,
-                        const std::vector<std::string>& excluded_categories);
-  void SendEndTracing();
-  void SendGetTraceBufferPercentFull();
-  void SendSetWatchEvent(const std::string& category_name,
-                         const std::string& event_name);
-  void SendCancelWatchEvent();
-
- protected:
-  virtual ~TraceMessageFilter();
-
- private:
-  // Message handlers.
-  void OnChildSupportsTracing();
-  void OnEndTracingAck(const std::vector<std::string>& known_categories);
-  void OnTraceNotification(int notification);
-  void OnTraceBufferPercentFullReply(float percent_full);
-  void OnTraceDataCollected(const std::string& data);
-
-  // ChildTraceMessageFilter exists:
-  bool has_child_;
-
-  // Awaiting ack for previously sent SendEndTracing
-  bool is_awaiting_end_ack_;
-  // Awaiting ack for previously sent SendGetTraceBufferPercentFull
-  bool is_awaiting_buffer_percent_full_ack_;
-
-  DISALLOW_COPY_AND_ASSIGN(TraceMessageFilter);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_TRACING_TRACE_MESSAGE_FILTER_H_
diff --git a/content/browser/tracing/trace_subscriber_stdio.cc b/content/browser/tracing/trace_subscriber_stdio.cc
deleted file mode 100644
index d366f1b..0000000
--- a/content/browser/tracing/trace_subscriber_stdio.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// 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 "content/browser/tracing/trace_subscriber_stdio.h"
-
-#include "base/bind.h"
-#include "base/debug/trace_event.h"
-#include "base/logging.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "content/public/browser/browser_thread.h"
-
-namespace content {
-
-// All method calls on this class are done on a SequencedWorkerPool thread.
-class TraceSubscriberStdioImpl
-    : public base::RefCountedThreadSafe<TraceSubscriberStdioImpl> {
- public:
-  explicit TraceSubscriberStdioImpl(const FilePath& path)
-      : path_(path),
-        file_(0) {}
-
-  void OnStart() {
-    DCHECK(!file_);
-    trace_buffer_.SetOutputCallback(
-        base::Bind(&TraceSubscriberStdioImpl::Write, this));
-    file_ = file_util::OpenFile(path_, "w+");
-    if (IsValid()) {
-      LOG(INFO) << "Logging performance trace to file: " << path_.value();
-      trace_buffer_.Start();
-    } else {
-      LOG(ERROR) << "Failed to open performance trace file: " << path_.value();
-    }
-  }
-
-  void OnData(const scoped_refptr<base::RefCountedString>& data_ptr) {
-    trace_buffer_.AddFragment(data_ptr->data());
-  }
-
-  void OnEnd() {
-    trace_buffer_.Finish();
-    CloseFile();
-  }
-
- private:
-  friend class base::RefCountedThreadSafe<TraceSubscriberStdioImpl>;
-
-  ~TraceSubscriberStdioImpl() {
-    CloseFile();
-  }
-
-  bool IsValid() const {
-    return file_ && (0 == ferror(file_));
-  }
-
-  void CloseFile() {
-    if (file_) {
-      fclose(file_);
-      file_ = 0;
-    }
-    // This is important, as it breaks a reference cycle.
-    trace_buffer_.SetOutputCallback(
-        base::debug::TraceResultBuffer::OutputCallback());
-  }
-
-  void Write(const std::string& output_str) {
-    if (IsValid()) {
-      size_t written = fwrite(output_str.data(), 1, output_str.size(), file_);
-      if (written != output_str.size()) {
-        LOG(ERROR) << "Error " << ferror(file_) << " in fwrite() to trace file";
-        CloseFile();
-      }
-    }
-  }
-
-  FilePath path_;
-  FILE* file_;
-  base::debug::TraceResultBuffer trace_buffer_;
-};
-
-TraceSubscriberStdio::TraceSubscriberStdio(const FilePath& path)
-    : impl_(new TraceSubscriberStdioImpl(path)) {
-  BrowserThread::PostBlockingPoolSequencedTask(
-      __FILE__, FROM_HERE,
-      base::Bind(&TraceSubscriberStdioImpl::OnStart, impl_));
-}
-
-TraceSubscriberStdio::~TraceSubscriberStdio() {
-}
-
-void TraceSubscriberStdio::OnEndTracingComplete() {
-  BrowserThread::PostBlockingPoolSequencedTask(
-      __FILE__, FROM_HERE,
-      base::Bind(&TraceSubscriberStdioImpl::OnEnd, impl_));
-}
-
-void TraceSubscriberStdio::OnTraceDataCollected(
-    const scoped_refptr<base::RefCountedString>& data_ptr) {
-  BrowserThread::PostBlockingPoolSequencedTask(
-      __FILE__, FROM_HERE,
-      base::Bind(&TraceSubscriberStdioImpl::OnData, impl_, data_ptr));
-}
-
-}  // namespace content
diff --git a/content/browser/tracing/trace_subscriber_stdio.h b/content/browser/tracing/trace_subscriber_stdio.h
deleted file mode 100644
index 7fa37e5..0000000
--- a/content/browser/tracing/trace_subscriber_stdio.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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.
-
-#ifndef CONTENT_BROWSER_TRACING_TRACE_SUBSCRIBER_STDIO_H_
-#define CONTENT_BROWSER_TRACING_TRACE_SUBSCRIBER_STDIO_H_
-
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "base/file_util.h"
-#include "content/public/browser/trace_subscriber.h"
-#include "content/common/content_export.h"
-
-namespace content {
-
-class TraceSubscriberStdioImpl;
-
-// Stdio implementation of TraceSubscriber. Use this to write traces to a file.
-class CONTENT_EXPORT TraceSubscriberStdio
-    : NON_EXPORTED_BASE(public TraceSubscriber) {
- public:
-  // Creates or overwrites the specified file. Check IsValid() for success.
-  explicit TraceSubscriberStdio(const FilePath& path);
-  virtual ~TraceSubscriberStdio();
-
-  // Implementation of TraceSubscriber
-  virtual void OnEndTracingComplete() OVERRIDE;
-  virtual void OnTraceDataCollected(
-      const scoped_refptr<base::RefCountedString>& data_ptr) OVERRIDE;
-
- private:
-  scoped_refptr<TraceSubscriberStdioImpl> impl_;
-  DISALLOW_COPY_AND_ASSIGN(TraceSubscriberStdio);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_TRACING_TRACE_SUBSCRIBER_STDIO_H_
diff --git a/content/browser/tracing/trace_subscriber_stdio_unittest.cc b/content/browser/tracing/trace_subscriber_stdio_unittest.cc
deleted file mode 100644
index 73ca474..0000000
--- a/content/browser/tracing/trace_subscriber_stdio_unittest.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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 "content/browser/tracing/trace_subscriber_stdio.h"
-
-#include "base/files/scoped_temp_dir.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "content/public/browser/browser_thread.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace content {
-
-class TraceSubscriberStdioTest : public ::testing::Test {};
-
-TEST_F(TraceSubscriberStdioTest, CanWriteDataToFile) {
-  base::ScopedTempDir trace_dir;
-  ASSERT_TRUE(trace_dir.CreateUniqueTempDir());
-  FilePath trace_file(trace_dir.path().AppendASCII("trace.txt"));
-  {
-    TraceSubscriberStdio subscriber(trace_file);
-
-    std::string foo("foo");
-    subscriber.OnTraceDataCollected(
-        make_scoped_refptr(base::RefCountedString::TakeString(&foo)));
-
-    std::string bar("bar");
-    subscriber.OnTraceDataCollected(
-        make_scoped_refptr(base::RefCountedString::TakeString(&bar)));
-
-    subscriber.OnEndTracingComplete();
-  }
-  BrowserThread::GetBlockingPool()->FlushForTesting();
-  std::string result;
-  EXPECT_TRUE(file_util::ReadFileToString(trace_file, &result));
-  EXPECT_EQ("[foo,bar]", result);
-}
-
-}  // namespace content
diff --git a/content/browser/webui/content_web_ui_controller_factory.cc b/content/browser/webui/content_web_ui_controller_factory.cc
index 38a5de4..c55ba1a 100644
--- a/content/browser/webui/content_web_ui_controller_factory.cc
+++ b/content/browser/webui/content_web_ui_controller_factory.cc
@@ -7,7 +7,6 @@
 #include "content/browser/gpu/gpu_internals_ui.h"
 #include "content/browser/media/media_internals_ui.h"
 #include "content/browser/media/webrtc_internals_ui.h"
-#include "content/browser/tracing/tracing_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/url_constants.h"
@@ -17,9 +16,6 @@ namespace content {
 WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType(
       BrowserContext* browser_context, const GURL& url) const {
   if (url.host() == chrome::kChromeUIWebRTCInternalsHost ||
-#if !defined(OS_ANDROID)
-      url.host() == chrome::kChromeUITracingHost ||
-#endif
       url.host() == chrome::kChromeUIGpuHost ||
       url.host() == chrome::kChromeUIMediaInternalsHost) {
     return const_cast<ContentWebUIControllerFactory*>(this);
@@ -45,10 +41,6 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL(
     return new GpuInternalsUI(web_ui);
   if (url.host() == chrome::kChromeUIMediaInternalsHost)
     return new MediaInternalsUI(web_ui);
-#if !defined(OS_ANDROID)
-  if (url.host() == chrome::kChromeUITracingHost)
-    return new TracingUI(web_ui);
-#endif
 
   return NULL;
 }
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 097529e..f0b73c9 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -853,8 +853,6 @@
     'browser/tracing/trace_message_filter.h',
     'browser/tracing/trace_subscriber_stdio.cc',
     'browser/tracing/trace_subscriber_stdio.h',
-    'browser/tracing/tracing_ui.cc',
-    'browser/tracing/tracing_ui.h',
     'browser/udev_linux.cc',
     'browser/udev_linux.h',
     'browser/user_metrics.cc',
@@ -1100,8 +1098,6 @@
         'browser/geolocation/network_location_provider.h',
         'browser/geolocation/network_location_request.cc',
         'browser/geolocation/network_location_request.h',
-        'browser/tracing/tracing_ui.cc',
-        'browser/tracing/tracing_ui.h',
       ],
     }, { # OS!="android"
       'dependencies': [
diff --git a/content/content_resources.grd b/content/content_resources.grd
index 799dd12..9fd530f 100644
--- a/content/content_resources.grd
+++ b/content/content_resources.grd
@@ -10,11 +10,6 @@
   </outputs>
   <translations />
   <release seq="1">
-    <messages fallback_to_english="true">
-      <message name="IDS_TRACING_TITLE" desc="Title for the about:tracing page.">
-        Tracing
-      </message>
-    </messages>
     <includes>
       <include name="IDR_GPU_BLACKLIST" file="browser/gpu/software_rendering_list.json" type="BINDATA" />
       <include name="IDR_GPU_INTERNALS_HTML" file="browser/resources/gpu/gpu_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
@@ -31,10 +26,6 @@
         <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" />
         <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('android')">
-        <include name="IDR_TRACING_HTML" file="../third_party/trace-viewer/src/about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-        <include name="IDR_TRACING_JS" file="../third_party/trace-viewer/src/about_tracing.js" flattenhtml="true" type="BINDATA" />
-      </if>
     </includes>
   </release>
 </grit>
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 6ad2694..07666fc 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -237,11 +237,6 @@ FilePath ContentBrowserClient::GetHyphenDictionaryDirectory() {
   return FilePath();
 }
 
-ui::SelectFilePolicy* ContentBrowserClient::CreateSelectFilePolicy(
-    WebContents* web_contents) {
-  return NULL;
-}
-
 #if defined(OS_WIN)
 const wchar_t* ContentBrowserClient::GetResourceDllName() {
   return NULL;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index b332073..db71bac 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -52,10 +52,6 @@ class URLRequestContext;
 class X509Certificate;
 }
 
-namespace ui {
-class SelectFilePolicy;
-}
-
 namespace content {
 
 class AccessTokenStore;
@@ -448,10 +444,6 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Returns the directory containing hyphenation dictionaries.
   virtual FilePath GetHyphenDictionaryDirectory();
 
-  // Returns an implementation of a file selecition policy. Can return NULL.
-  virtual ui::SelectFilePolicy* CreateSelectFilePolicy(
-      WebContents* web_contents);
-
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Populates |mappings| with all files that need to be mapped before launching
   // a child process.
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index fbeaf19..716260a 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -42,7 +42,6 @@ const char kChromeUIMediaInternalsHost[] = "media-internals";
 const char kChromeUINetworkViewCacheHost[] = "view-http-cache";
 const char kChromeUIResourcesHost[] = "resources";
 const char kChromeUITcmallocHost[] = "tcmalloc";
-const char kChromeUITracingHost[] = "tracing";
 const char kChromeUIWebRTCInternalsHost[] = "webrtc-internals";
 
 const char kChromeUICrashURL[] = "chrome://crash";
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index 8961b20..3a7a69d 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -48,7 +48,6 @@ CONTENT_EXPORT extern const char kChromeUIMediaInternalsHost[];
 CONTENT_EXPORT extern const char kChromeUINetworkViewCacheHost[];
 CONTENT_EXPORT extern const char kChromeUIResourcesHost[];
 CONTENT_EXPORT extern const char kChromeUITcmallocHost[];
-CONTENT_EXPORT extern const char kChromeUITracingHost[];
 CONTENT_EXPORT extern const char kChromeUIWebRTCInternalsHost[];
 
 // Full about URLs (including schemes).
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 51e03b3..554ec0d 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -184,7 +184,6 @@
   },
   "content/content_resources.grd": {
     "includes": [25000],
-    "messages": [25250],
   },
   "content/shell/shell_resources.grd": {
     "includes": [25500],