Revert of Revert of Revert "Revert 237280 "Remove TraceController""

Reapply "Remove TraceController"

This reverts https://codereview.chromium.org/101543004/ which was created when
suspected the reason of failure of telemetry tests, but turned out not the real
reason. Reapply.

Reapply the following change:

> Revert "Revert 237280 "Remove TraceController""
>
> This reverts commit 6aa58b8599840160df945afa89e7482d14d1c4d4.
>
> Fixed double-close issue when ending recording.
>
> > Revert 237280 "Remove TraceController"
> >
> > Seems to have broken trace-based telemetry benchmarks on android.
> >
> > BUG=323749
> >
> > > Remove TraceController
> > >
> > > TraceController is obsoleted by TracingController.
> > > Changed all remaining clients to use TracingController.
> > >
> > > BUG=none
> > >
> > > Review URL: https://codereview.chromium.org/67683003
> >
> > TBR=wangxianzhu@chromium.org
> >
> > Review URL: https://codereview.chromium.org/89753004
> >
> > git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237452 0039d316-1c4b-4281-b951-d872f2087c98
>
> TBR=wangxianzhu@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238234

TBR=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238442

[Xianzhu, 2013-12-03 18:35:10]

Created Revert of Revert of Revert "Revert 237280 "Remove TraceController""

[commit-bot: I haz the power, 2013-12-03 18:35:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wangxianzhu@chromium.org/102003003/1

[commit-bot: I haz the power, 2013-12-03 18:35:49]

Failed to apply patch for chrome/browser/feedback/feedback_util.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/feedback/feedback_util.cc
  Hunk #1 FAILED at 374.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/feedback/feedback_util.cc.rej

Patch:       chrome/browser/feedback/feedback_util.cc
Index: chrome/browser/feedback/feedback_util.cc
diff --git a/chrome/browser/feedback/feedback_util.cc
b/chrome/browser/feedback/feedback_util.cc
index
ace8c39a2018276e299f7f5e1c8d0cd073882a78..969bb9e47b5ed1b595b01e696dfe65310282f8c1
100644
--- a/chrome/browser/feedback/feedback_util.cc
+++ b/chrome/browser/feedback/feedback_util.cc
@@ -374,24 +374,33 @@
 bool ZipString(const base::FilePath& filename,
                const std::string& data, std::string* compressed_logs) {
   base::FilePath temp_path;
-  base::FilePath zip_file;
-
-  // Create a temporary directory, put the logs into a file in it. Create
-  // another temporary file to receive the zip file in.
+
+  // Create a temporary directory, put the logs into a file in it.
   if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""), &temp_path))
     return false;
-  if (file_util::WriteFile(temp_path.Append(filename),
-                           data.c_str(), data.size()) == -1)
+
+  base::FilePath temp_file = temp_path.Append(filename);
+  if (file_util::WriteFile(temp_file, data.c_str(), data.size()) == -1)
     return false;
+
+  return ZipFile(temp_file, compressed_logs);
+}
+
+bool ZipFile(const base::FilePath& filename, std::string* compressed_logs) {
+  base::FilePath zip_file;
+
+  // Create a temporary file to receive the zip file in it.
   if (!file_util::CreateTemporaryFile(&zip_file))
     return false;
 
-  if (!zip::Zip(temp_path, zip_file, false))
+  if (!zip::Zip(filename, zip_file, false))
     return false;
 
   if (!base::ReadFileToString(zip_file, compressed_logs))
     return false;
 
+  base::DeleteFile(zip_file, false);
+
   return true;
 }

[commit-bot: I haz the power, 2013-12-03 18:53:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wangxianzhu@chromium.org/102003003/150001

[commit-bot: I haz the power, 2013-12-03 19:21:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wangxianzhu@chromium.org/102003003/150001

[Xianzhu, 2013-12-03 19:48:28]

Committed patchset #2 manually as r238442 (presubmit successful).