Add the tracing manager

chrome/browser/feedback/feedback_util.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/feedback/feedback_util.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 20 matching lines @@
 #include "content/public/common/content_client.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/icu/source/common/unicode/locid.h"
+#include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
-#if defined(OS_CHROMEOS)
-#include "third_party/zlib/google/zip.h"
-#endif
-
 using content::WebContents;
 
 namespace {
 const char kLogsFilename[] = "system_logs.txt";
 }
 
 namespace chrome {
 const char kAppLauncherCategoryTag[] = "AppLauncher";
 }  // namespace chrome
 
@@ skipping 369 matching lines @@
     screenshot_size = new gfx::Rect();
   return *screenshot_size;
 }
 
 // static
 void FeedbackUtil::SetScreenshotSize(const gfx::Rect& rect) {
   gfx::Rect& screen_size = GetScreenshotSize();
   screen_size = rect;
 }
 
-#if defined(OS_CHROMEOS)
 // static
 bool FeedbackUtil::ZipString(const std::string& logs,
                              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.
-  if (!file_util::CreateNewTempDirectory("", &temp_path))
+  if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""), &temp_path))
     return false;
-  if (file_util::WriteFile(
-      temp_path.Append(kLogsFilename), logs.c_str(), logs.size()) == -1)
+  if (file_util::WriteFile(temp_path.Append(FILE_PATH_LITERAL(kLogsFilename)),
+                           logs.c_str(), logs.size()) == -1)
     return false;
   if (!file_util::CreateTemporaryFile(&zip_file))
     return false;
 
   if (!zip::Zip(temp_path, zip_file, false))
     return false;
 
   if (!file_util::ReadFileToString(zip_file, compressed_logs))
     return false;
 
   return true;
 }
-#endif // OS_CHROMEOS
-