Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/page_load_metrics/browser/metrics_web_contents_observer.h" 5 #include "components/page_load_metrics/browser/metrics_web_contents_observer.h"
6 6
7 #include <memory>
7 #include <vector> 8 #include <vector>
8 9
9 #include "base/macros.h" 10 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/ptr_util.h"
11 #include "base/process/kill.h" 12 #include "base/process/kill.h"
12 #include "base/test/histogram_tester.h" 13 #include "base/test/histogram_tester.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "components/page_load_metrics/browser/page_load_metrics_observer.h" 15 #include "components/page_load_metrics/browser/page_load_metrics_observer.h"
15 #include "components/page_load_metrics/common/page_load_metrics_messages.h" 16 #include "components/page_load_metrics/common/page_load_metrics_messages.h"
16 #include "content/public/browser/navigation_handle.h" 17 #include "content/public/browser/navigation_handle.h"
17 #include "content/public/browser/render_frame_host.h" 18 #include "content/public/browser/render_frame_host.h"
18 #include "content/public/test/test_renderer_host.h" 19 #include "content/public/test/test_renderer_host.h"
19 #include "content/public/test/web_contents_tester.h" 20 #include "content/public/test/web_contents_tester.h"
20 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 public: 59 public:
59 TestPageLoadMetricsEmbedderInterface() : is_prerendering_(false) {} 60 TestPageLoadMetricsEmbedderInterface() : is_prerendering_(false) {}
60 61
61 bool IsPrerendering(content::WebContents* web_contents) override { 62 bool IsPrerendering(content::WebContents* web_contents) override {
62 return is_prerendering_; 63 return is_prerendering_;
63 } 64 }
64 void set_is_prerendering(bool is_prerendering) { 65 void set_is_prerendering(bool is_prerendering) {
65 is_prerendering_ = is_prerendering; 66 is_prerendering_ = is_prerendering;
66 } 67 }
67 void RegisterObservers(PageLoadTracker* tracker) override { 68 void RegisterObservers(PageLoadTracker* tracker) override {
68 tracker->AddObserver(make_scoped_ptr(new TestPageLoadMetricsObserver( 69 tracker->AddObserver(base::WrapUnique(new TestPageLoadMetricsObserver(
69 &observed_timings_, &observed_committed_urls_))); 70 &observed_timings_, &observed_committed_urls_)));
70 } 71 }
71 const std::vector<PageLoadTiming>& observed_timings() const { 72 const std::vector<PageLoadTiming>& observed_timings() const {
72 return observed_timings_; 73 return observed_timings_;
73 } 74 }
74 75
75 // currently_committed_urls passed to OnStart(). 76 // currently_committed_urls passed to OnStart().
76 const std::vector<GURL>& observed_committed_urls_from_on_start() const { 77 const std::vector<GURL>& observed_committed_urls_from_on_start() const {
77 return observed_committed_urls_; 78 return observed_committed_urls_;
78 } 79 }
(...skipping 24 matching lines...) Expand all
103 content::RenderFrameHost* render_frame_host) { 104 content::RenderFrameHost* render_frame_host) {
104 ASSERT_TRUE(observer_->OnMessageReceived( 105 ASSERT_TRUE(observer_->OnMessageReceived(
105 PageLoadMetricsMsg_TimingUpdated(observer_->routing_id(), timing, 106 PageLoadMetricsMsg_TimingUpdated(observer_->routing_id(), timing,
106 PageLoadMetadata()), 107 PageLoadMetadata()),
107 render_frame_host)); 108 render_frame_host));
108 } 109 }
109 110
110 void AttachObserver() { 111 void AttachObserver() {
111 embedder_interface_ = new TestPageLoadMetricsEmbedderInterface(); 112 embedder_interface_ = new TestPageLoadMetricsEmbedderInterface();
112 observer_.reset(new MetricsWebContentsObserver( 113 observer_.reset(new MetricsWebContentsObserver(
113 web_contents(), make_scoped_ptr(embedder_interface_))); 114 web_contents(), base::WrapUnique(embedder_interface_)));
114 observer_->WasShown(); 115 observer_->WasShown();
115 } 116 }
116 117
117 void CheckErrorEvent(InternalErrorLoadEvent error, int count) { 118 void CheckErrorEvent(InternalErrorLoadEvent error, int count) {
118 histogram_tester_.ExpectBucketCount(internal::kErrorEvents, error, count); 119 histogram_tester_.ExpectBucketCount(internal::kErrorEvents, error, count);
119 num_errors_ += count; 120 num_errors_ += count;
120 } 121 }
121 122
122 void CheckTotalErrorEvents() { 123 void CheckTotalErrorEvents() {
123 histogram_tester_.ExpectTotalCount(internal::kErrorEvents, num_errors_); 124 histogram_tester_.ExpectTotalCount(internal::kErrorEvents, num_errors_);
(...skipping 26 matching lines...) Expand all
150 ASSERT_TRUE(embedder_interface_->observed_timings().empty()); 151 ASSERT_TRUE(embedder_interface_->observed_timings().empty());
151 } 152 }
152 153
153 const std::vector<GURL>& observed_committed_urls_from_on_start() const { 154 const std::vector<GURL>& observed_committed_urls_from_on_start() const {
154 return embedder_interface_->observed_committed_urls_from_on_start(); 155 return embedder_interface_->observed_committed_urls_from_on_start();
155 } 156 }
156 157
157 protected: 158 protected:
158 base::HistogramTester histogram_tester_; 159 base::HistogramTester histogram_tester_;
159 TestPageLoadMetricsEmbedderInterface* embedder_interface_; 160 TestPageLoadMetricsEmbedderInterface* embedder_interface_;
160 scoped_ptr<MetricsWebContentsObserver> observer_; 161 std::unique_ptr<MetricsWebContentsObserver> observer_;
161 162
162 private: 163 private:
163 int num_errors_; 164 int num_errors_;
164 165
165 DISALLOW_COPY_AND_ASSIGN(MetricsWebContentsObserverTest); 166 DISALLOW_COPY_AND_ASSIGN(MetricsWebContentsObserverTest);
166 }; 167 };
167 168
168 TEST_F(MetricsWebContentsObserverTest, SuccessfulMainFrameNavigation) { 169 TEST_F(MetricsWebContentsObserverTest, SuccessfulMainFrameNavigation) {
169 PageLoadTiming timing; 170 PageLoadTiming timing;
170 timing.navigation_start = base::Time::FromDoubleT(1); 171 timing.navigation_start = base::Time::FromDoubleT(1);
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 rfh_tester->SimulateNavigationStop(); 408 rfh_tester->SimulateNavigationStop();
408 409
409 web_contents()->Stop(); 410 web_contents()->Stop();
410 411
411 histogram_tester_.ExpectTotalCount(internal::kAbortChainSizeNoCommit, 1); 412 histogram_tester_.ExpectTotalCount(internal::kAbortChainSizeNoCommit, 1);
412 histogram_tester_.ExpectBucketCount(internal::kAbortChainSizeNoCommit, 3, 413 histogram_tester_.ExpectBucketCount(internal::kAbortChainSizeNoCommit, 3,
413 1); 414 1);
414 } 415 }
415 416
416 } // namespace page_load_metrics 417 } // namespace page_load_metrics
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698