Refactor ownership model for FirstWebContentsProfiler.

chrome/browser/metrics/first_web_contents_profiler.cc

 // Copyright 2014 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.
 
 #if !defined(OS_ANDROID)
 
 #include "chrome/browser/metrics/first_web_contents_profiler.h"
 
 #include <string>
 
@@ skipping 79 matching lines @@
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&RecordUIResponsiveness, responsiveness_histogram,
                  unresponsiveness_histogram, base::Time::Now(),
                  base::Time::Now(),
                  base::TimeDelta::FromMilliseconds(kInitialDelayMs)));
 }
 
 }  // namespace
 
-scoped_ptr<FirstWebContentsProfiler>
-FirstWebContentsProfiler::CreateProfilerForFirstWebContents(
-    Delegate* delegate) {
-  DCHECK(delegate);
-  for (chrome::BrowserIterator iterator; !iterator.done(); iterator.Next()) {
-    Browser* browser = *iterator;
+// static
+void FirstWebContentsProfiler::Start() {
+  for (chrome::BrowserIterator browser_it; !browser_it.done();
+       browser_it.Next()) {
     content::WebContents* web_contents =
-        browser->tab_strip_model()->GetActiveWebContents();
+        browser_it->tab_strip_model()->GetActiveWebContents();
     if (web_contents) {
-      return scoped_ptr<FirstWebContentsProfiler>(
-          new FirstWebContentsProfiler(web_contents, delegate));
+      new FirstWebContentsProfiler(web_contents);

[Alexei Svitkine (slow), 2015/11/13 17:29:00]

Add a comment about the lifetime here.

[gab, 2015/11/13 19:22:21]

Good point, done.

+      return;
     }
   }
-  return nullptr;
 }
 
 FirstWebContentsProfiler::FirstWebContentsProfiler(
-    content::WebContents* web_contents,
-    Delegate* delegate)
+    content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       initial_entry_committed_(false),
       collected_paint_metric_(false),
       collected_load_metric_(false),
-      delegate_(delegate),
       responsiveness_histogram_(NULL),
       responsiveness_1sec_histogram_(NULL),
       responsiveness_10sec_histogram_(NULL),
       unresponsiveness_histogram_(NULL),
       unresponsiveness_1sec_histogram_(NULL),
       unresponsiveness_10sec_histogram_(NULL) {
   InitHistograms();
 }
 
 void FirstWebContentsProfiler::DidFirstVisuallyNonEmptyPaint() {
@@ skipping 84 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason",
                             finish_reason, FinishReason::ENUM_MAX);
   if (!collected_paint_metric_) {
     UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason_NoPaint",
                               finish_reason, FinishReason::ENUM_MAX);
   }
   if (!collected_load_metric_) {
     UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason_NoLoad",
                               finish_reason, FinishReason::ENUM_MAX);
   }
-  delegate_->ProfilerFinishedCollectingMetrics();
+  delete this;
 }
 
 void FirstWebContentsProfiler::InitHistograms() {
   const std::string responsiveness_histogram_name =
       "Startup.FirstWebContents.UIResponsive";
   responsiveness_histogram_ = base::Histogram::FactoryTimeGet(
       responsiveness_histogram_name, base::TimeDelta::FromMilliseconds(1),
       base::TimeDelta::FromSeconds(60), 100,
       base::Histogram::kUmaTargetedHistogramFlag);
 
@@ skipping 26 matching lines @@
       100, base::Histogram::kUmaTargetedHistogramFlag);
 
   const std::string unresponsiveness_10sec_histogram_name =
       "Startup.FirstWebContents.UINotResponsive_10sec";
   unresponsiveness_10sec_histogram_ = base::Histogram::FactoryTimeGet(
       unresponsiveness_10sec_histogram_name,
       base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromSeconds(60),
       100, base::Histogram::kUmaTargetedHistogramFlag);
 }
 #endif  // !defined(OS_ANDROID)