Remove dependency from breakpad to CrashUploadList

BUG=247431
R=marja@chromium.org

Review URL: https://codereview.chromium.org/19729017

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

5 files changed, 15 insertions, 3 deletions

diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc
index ecab0fd..f4b5caa 100644
--- a/chrome/app/breakpad_linux.cc
+++ b/chrome/app/breakpad_linux.cc
@@ -38,7 +38,6 @@
 #include "breakpad/src/common/linux/linux_libc_support.h"
 #include "breakpad/src/common/memory.h"
 #include "chrome/app/breakpad_linux_impl.h"
-#include "chrome/browser/crash_upload_list.h"
 #include "chrome/common/child_process_logging.h"
 #include "components/breakpad/breakpad_client.h"
 #include "content/public/common/content_descriptors.h"
@@ -651,8 +650,8 @@ void EnableCrashDumping(bool unattended) {
 
   base::FilePath dumps_path(tmp_path);
   if (breakpad::GetBreakpadClient()->GetCrashDumpLocation(&dumps_path)) {
-    base::FilePath logfile =
-        dumps_path.AppendASCII(CrashUploadList::kReporterLogFilename);
+    base::FilePath logfile = dumps_path.Append(
+        breakpad::GetBreakpadClient()->GetReporterLogFilename());
     std::string logfile_str = logfile.value();
     const size_t crash_log_path_len = logfile_str.size() + 1;
     g_crash_log_path = new char[crash_log_path_len];
diff --git a/chrome/app/chrome_breakpad_client.cc b/chrome/app/chrome_breakpad_client.cc
index 00e75cc..bb02f9b 100644
--- a/chrome/app/chrome_breakpad_client.cc
+++ b/chrome/app/chrome_breakpad_client.cc
@@ -22,6 +22,7 @@
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
+#include "chrome/browser/crash_upload_list.h"
 #include "chrome/common/chrome_version_info_posix.h"
 #endif
 
@@ -139,6 +140,10 @@ void ChromeBreakpadClient::GetProductNameAndVersion(std::string* product_name,
 
   *version = PRODUCT_VERSION;
 }
+
+base::FilePath ChromeBreakpadClient::GetReporterLogFilename() {
+  return base::FilePath(CrashUploadList::kReporterLogFilename);
+}
 #endif
 
 bool ChromeBreakpadClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
diff --git a/chrome/app/chrome_breakpad_client.h b/chrome/app/chrome_breakpad_client.h
index d9cd22e..348232f 100644
--- a/chrome/app/chrome_breakpad_client.h
+++ b/chrome/app/chrome_breakpad_client.h
@@ -33,6 +33,7 @@ class ChromeBreakpadClient : public breakpad::BreakpadClient {
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
   virtual void GetProductNameAndVersion(std::string* product_name,
                                         std::string* version) OVERRIDE;
+  virtual base::FilePath GetReporterLogFilename() OVERRIDE;
 #endif
 
   virtual bool GetCrashDumpLocation(base::FilePath* crash_dir) OVERRIDE;
diff --git a/components/breakpad/breakpad_client.cc b/components/breakpad/breakpad_client.cc
index 502884e..043e645 100644
--- a/components/breakpad/breakpad_client.cc
+++ b/components/breakpad/breakpad_client.cc
@@ -4,6 +4,7 @@
 
 #include "components/breakpad/breakpad_client.h"
 
+#include "base/files/file_path.h"
 #include "base/logging.h"
 
 namespace breakpad {
@@ -53,6 +54,10 @@ bool BreakpadClient::AboutToRestart() {
 void BreakpadClient::GetProductNameAndVersion(std::string* product_name,
                                               std::string* version) {
 }
+
+base::FilePath BreakpadClient::GetReporterLogFilename() {
+  return base::FilePath();
+}
 #endif
 
 bool BreakpadClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
diff --git a/components/breakpad/breakpad_client.h b/components/breakpad/breakpad_client.h
index 12dccde..9cea305 100644
--- a/components/breakpad/breakpad_client.h
+++ b/components/breakpad/breakpad_client.h
@@ -61,6 +61,8 @@ class BreakpadClient {
   // in the crash report.
   virtual void GetProductNameAndVersion(std::string* product_name,
                                         std::string* version);
+
+  virtual base::FilePath GetReporterLogFilename();
 #endif
 
   // The location where minidump files should be written. Returns true if