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

Side by Side Diff: content/browser/frame_host/frame_tree_unittest.cc

Issue 667943003: Standardize usage of virtual/override/final in content/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/browser/frame_host/frame_tree.h" 5 #include "content/browser/frame_host/frame_tree.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "content/browser/frame_host/navigator_impl.h" 9 #include "content/browser/frame_host/navigator_impl.h"
10 #include "content/browser/frame_host/render_frame_host_factory.h" 10 #include "content/browser/frame_host/render_frame_host_factory.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 result->append("]"); 44 result->append("]");
45 } 45 }
46 46
47 // Logs calls to WebContentsObserver along with the state of the frame tree, 47 // Logs calls to WebContentsObserver along with the state of the frame tree,
48 // for later use in EXPECT_EQ(). 48 // for later use in EXPECT_EQ().
49 class TreeWalkingWebContentsLogger : public WebContentsObserver { 49 class TreeWalkingWebContentsLogger : public WebContentsObserver {
50 public: 50 public:
51 explicit TreeWalkingWebContentsLogger(WebContents* web_contents) 51 explicit TreeWalkingWebContentsLogger(WebContents* web_contents)
52 : WebContentsObserver(web_contents) {} 52 : WebContentsObserver(web_contents) {}
53 53
54 virtual ~TreeWalkingWebContentsLogger() { 54 ~TreeWalkingWebContentsLogger() override {
55 EXPECT_EQ("", log_) << "Activity logged that was not expected"; 55 EXPECT_EQ("", log_) << "Activity logged that was not expected";
56 } 56 }
57 57
58 // Gets and resets the log, which is a string of what happened. 58 // Gets and resets the log, which is a string of what happened.
59 std::string GetLog() { 59 std::string GetLog() {
60 std::string result = log_; 60 std::string result = log_;
61 log_.clear(); 61 log_.clear();
62 return result; 62 return result;
63 } 63 }
64 64
65 // content::WebContentsObserver implementation. 65 // content::WebContentsObserver implementation.
66 virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override { 66 void RenderFrameCreated(RenderFrameHost* render_frame_host) override {
67 LogWhatHappened("RenderFrameCreated", render_frame_host); 67 LogWhatHappened("RenderFrameCreated", render_frame_host);
68 } 68 }
69 69
70 virtual void RenderFrameHostChanged(RenderFrameHost* old_host, 70 void RenderFrameHostChanged(RenderFrameHost* old_host,
71 RenderFrameHost* new_host) override { 71 RenderFrameHost* new_host) override {
72 if (old_host) 72 if (old_host)
73 LogWhatHappened("RenderFrameChanged(old)", old_host); 73 LogWhatHappened("RenderFrameChanged(old)", old_host);
74 LogWhatHappened("RenderFrameChanged(new)", new_host); 74 LogWhatHappened("RenderFrameChanged(new)", new_host);
75 } 75 }
76 76
77 virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override { 77 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
78 LogWhatHappened("RenderFrameDeleted", render_frame_host); 78 LogWhatHappened("RenderFrameDeleted", render_frame_host);
79 } 79 }
80 80
81 virtual void RenderProcessGone(base::TerminationStatus status) override { 81 void RenderProcessGone(base::TerminationStatus status) override {
82 LogWhatHappened("RenderProcessGone"); 82 LogWhatHappened("RenderProcessGone");
83 } 83 }
84 84
85 private: 85 private:
86 void LogWhatHappened(const std::string& event_name) { 86 void LogWhatHappened(const std::string& event_name) {
87 if (!log_.empty()) { 87 if (!log_.empty()) {
88 log_.append("\n"); 88 log_.append("\n");
89 } 89 }
90 log_.append(event_name + " -> "); 90 log_.append(event_name + " -> ");
91 AppendTreeNodeState( 91 AppendTreeNodeState(
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 int process_id = root->current_frame_host()->GetProcess()->GetID(); 240 int process_id = root->current_frame_host()->GetProcess()->GetID();
241 241
242 ASSERT_EQ("1: []", GetTreeState(frame_tree)); 242 ASSERT_EQ("1: []", GetTreeState(frame_tree));
243 243
244 // Simulate attaching a frame from mismatched process id. 244 // Simulate attaching a frame from mismatched process id.
245 ASSERT_FALSE(frame_tree->AddFrame(root, process_id + 1, 1, std::string())); 245 ASSERT_FALSE(frame_tree->AddFrame(root, process_id + 1, 1, std::string()));
246 ASSERT_EQ("1: []", GetTreeState(frame_tree)); 246 ASSERT_EQ("1: []", GetTreeState(frame_tree));
247 } 247 }
248 248
249 } // namespace content 249 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_browsertest.cc ('k') | content/browser/frame_host/interstitial_page_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698