Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
diff --git a/components/breakpad/breakpad_client.cc b/components/breakpad/breakpad_client.cc
index 41271ed..502884e 100644
--- a/components/breakpad/breakpad_client.cc
+++ b/components/breakpad/breakpad_client.cc
@@ -31,6 +31,28 @@
     base::FilePath* crash_dir) {
   return false;
 }
+
+void BreakpadClient::GetProductNameAndVersion(const base::FilePath& exe_path,
+                                              base::string16* product_name,
+                                              base::string16* version,
+                                              base::string16* special_build) {
+}
+
+bool BreakpadClient::ShouldShowRestartDialog(base::string16* title,
+                                             base::string16* message,
+                                             bool* is_rtl_locale) {
+  return false;
+}
+
+bool BreakpadClient::AboutToRestart() {
+  return true;
+}
+#endif
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
+void BreakpadClient::GetProductNameAndVersion(std::string* product_name,
+                                              std::string* version) {
+}
 #endif
 
 bool BreakpadClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
@@ -42,4 +64,12 @@
 }
 #endif
 
+size_t BreakpadClient::RegisterCrashKeys() {
+  return 0;
+}
+
+bool BreakpadClient::IsRunningUnattended() {
+  return false;
+}
+
 }  // namespace breakpad