Wire up OOM exception to the sad tab page.

chrome/browser/ui/views/sad_tab_view.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/ui/views/sad_tab_view.h"
 
 #include <string>
 
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
@@ skipping 32 matching lines @@
 namespace {
 
 const int kMaxContentWidth = 600;
 const int kMinColumnWidth = 120;
 const char kCategoryTagCrash[] = "Crash";
 const int kCrashesBeforeFeedbackIsDisplayed = 1;
 
 void RecordKillCreated() {
   static int killed = 0;
   killed++;
-  UMA_HISTOGRAM_CUSTOM_COUNTS(
-      "Tabs.SadTab.KillCreated", killed, 1, 1000, 50);
+  UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillCreated", killed);
 }
 
 void RecordKillDisplayed() {
   static int killed = 0;
   killed++;
-  UMA_HISTOGRAM_CUSTOM_COUNTS(
-      "Tabs.SadTab.KillDisplayed", killed, 1, 1000, 50);
+  UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillDisplayed", killed);
 }
 
 #if defined(OS_CHROMEOS)
 void RecordKillCreatedOOM() {
   static int oom_killed = 0;
   oom_killed++;
-  UMA_HISTOGRAM_CUSTOM_COUNTS(
-      "Tabs.SadTab.KillCreated.OOM", oom_killed, 1, 1000, 50);
+  UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillCreated.OOM", oom_killed);
 }
 
 void RecordKillDisplayedOOM() {
   static int oom_killed = 0;
   oom_killed++;
-  UMA_HISTOGRAM_CUSTOM_COUNTS(
-      "Tabs.SadTab.KillDisplayed.OOM", oom_killed, 1, 1000, 50);
+  UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillDisplayed.OOM", oom_killed);
 }
 #endif
 
 }  // namespace
 
 int SadTabView::total_crashes_ = 0;
 
 SadTabView::SadTabView(WebContents* web_contents, chrome::SadTabKind kind)
     : web_contents_(web_contents),
       kind_(kind),
       painted_(false),
       message_(nullptr),
       help_link_(nullptr),
       action_button_(nullptr),
       title_(nullptr),
       help_message_(nullptr) {
   DCHECK(web_contents);
 
   // These stats should use the same counting approach and bucket size used for
   // tab discard events in memory::OomPriorityManager so they can be directly
   // compared.
   // TODO(jamescook): Maybe track time between sad tabs?
   total_crashes_++;
 
   switch (kind_) {
     case chrome::SAD_TAB_KIND_CRASHED: {
       static int crashed = 0;
       crashed++;
-      UMA_HISTOGRAM_CUSTOM_COUNTS(
-          "Tabs.SadTab.CrashCreated", crashed, 1, 1000, 50);
+      UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.CrashCreated", crashed);
       break;
     }
     case chrome::SAD_TAB_KIND_KILLED: {
       RecordKillCreated();
       LOG(WARNING) << "Tab Killed: "
                    <<  web_contents->GetURL().GetOrigin().spec();
       break;
     }
+    case chrome::SAD_TAB_KIND_OOM: {
+      static int crashed_due_to_oom = 0;
+      crashed_due_to_oom++;
+      UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.OomCreated", crashed_due_to_oom);
+      break;
+    }
 #if defined(OS_CHROMEOS)
     case chrome::SAD_TAB_KIND_KILLED_BY_OOM: {
       RecordKillCreated();
       RecordKillCreatedOOM();
       const std::string spec = web_contents->GetURL().GetOrigin().spec();
       memory::OomMemoryDetails::Log(
           "Tab OOM-Killed Memory details: " + spec + ", ", base::Closure());
       break;
     }
 #endif
@@ skipping 34 matching lines @@
   layout->AddView(title_, 2, 1);
 
   const SkColor text_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor);
 
   int message_id = IDS_SAD_TAB_MESSAGE;
 #if defined(OS_CHROMEOS)
   if (kind_ == chrome::SAD_TAB_KIND_KILLED_BY_OOM)
     message_id = IDS_KILLED_TAB_BY_OOM_MESSAGE;
 #endif
+  if (kind_ == chrome::SAD_TAB_KIND_OOM)
+    message_id = IDS_SAD_TAB_OOM_MESSAGE;
 
   message_ = CreateLabel(l10n_util::GetStringUTF16(message_id));
 
   message_->SetMultiLine(true);
   message_->SetEnabledColor(text_color);
   message_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   message_->SetLineHeight(views::kPanelSubVerticalSpacing);
 
   layout->StartRowWithPadding(0, column_set_id, 0, views::kPanelVertMargin);
   layout->AddView(message_, 2, 1, views::GridLayout::LEADING,
@@ skipping 62 matching lines @@
 }
 
 void SadTabView::OnPaint(gfx::Canvas* canvas) {
   if (!painted_) {
     // These stats should use the same counting approach and bucket size used
     // for tab discard events in memory::OomPriorityManager so they can be
     // directly compared.
     switch (kind_) {
       case chrome::SAD_TAB_KIND_CRASHED: {
         static int crashed = 0;
-        UMA_HISTOGRAM_CUSTOM_COUNTS(
-            "Tabs.SadTab.CrashDisplayed", ++crashed, 1, 1000, 50);
+        UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.CrashDisplayed", ++crashed);

[Alexei Svitkine (slow), 2016/07/25 22:15:44]

Nit: I'd also put the increment outside the macro.

While I know it's OK in this case, macros are dangerous because the same arg can
be evaluated multiple times when expanded, so when I see a ++ in a macro, I
always wonder if it's correct. Now, for these ones I know it's fine, but other
readers might not. So best to remove doubt and put it in the line above. Same
for the one below.

[Will Harris, 2016/07/25 23:15:32]

thanks for pointing this out, I also much prefer incrementing outside the macro.
Done.

+        break;
+      }
+      case chrome::SAD_TAB_KIND_OOM: {
+        static int crashed_due_to_oom = 0;
+        UMA_HISTOGRAM_COUNTS_1000(
+            "Tabs.SadTab.OomDisplayed", ++crashed_due_to_oom);
         break;
       }
       case chrome::SAD_TAB_KIND_KILLED:
         RecordKillDisplayed();
         break;
 #if defined(OS_CHROMEOS)
       case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
         RecordKillDisplayed();
         RecordKillDisplayedOOM();
         break;
@@ skipping 46 matching lines @@
 }
 
 namespace chrome {
 
 SadTab* SadTab::Create(content::WebContents* web_contents,
                        SadTabKind kind) {
   return new SadTabView(web_contents, kind);
 }
 
 }  // namespace chrome