Merge 86806 - Dbus call timeout handled

chrome/browser/browser_main.cc

 // Copyright (c) 2011 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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 884 matching lines @@
                              "allocate widget with width") &&
              !GTK_CHECK_VERSION(2, 16, 1)) {
     // This warning only occurs in obsolete versions of GTK and is harmless.
     // http://crbug.com/11133
   } else if (strstr(message, "Theme file for default has no") ||
              strstr(message, "Theme directory") ||
              strstr(message, "theme pixmap")) {
     LOG(ERROR) << "GTK theme error: " << message;
   } else if (strstr(message, "gtk_drag_dest_leave: assertion")) {
     LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557";
+  } else if (strstr(message, "Out of memory") &&
+             strstr(log_domain, "<unknown>")) {
+    LOG(ERROR) << "DBus call timeout or out of memory: "
+               << "http://crosbug.com/15496";
   } else {
     LOG(DFATAL) << log_domain << ": " << message;
   }
 }
 
 static void SetUpGLibLogHandler() {
   // Register GLib-handled assertions to go through our logging system.
   const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" };
   for (size_t i = 0; i < arraysize(kLogDomains); i++) {
     g_log_set_handler(kLogDomains[i],
@@ skipping 985 matching lines @@
 #if defined(OS_CHROMEOS)
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
   TRACE_EVENT_END("BrowserMain", 0, 0);
   return result_code;
 }