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

Side by Side Diff: content/public/test/content_browser_test_utils.cc

Issue 803873004: ContentBrowserSanityChecker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Jiggle the comments. Created 5 years, 12 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/public/test/content_browser_test_utils.h" 5 #include "content/public/test/content_browser_test_utils.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 bool render_view_created_called_; 130 bool render_view_created_called_;
131 }; 131 };
132 132
133 WebContentsAddedObserver::WebContentsAddedObserver() 133 WebContentsAddedObserver::WebContentsAddedObserver()
134 : web_contents_created_callback_( 134 : web_contents_created_callback_(
135 base::Bind( 135 base::Bind(
136 &WebContentsAddedObserver::WebContentsCreated, 136 &WebContentsAddedObserver::WebContentsCreated,
137 base::Unretained(this))), 137 base::Unretained(this))),
138 web_contents_(NULL) { 138 web_contents_(NULL) {
139 WebContentsImpl::AddCreatedCallback(web_contents_created_callback_); 139 WebContentsImpl::FriendZone::AddCreatedCallbackForTesting(
140 web_contents_created_callback_);
140 } 141 }
141 142
142 WebContentsAddedObserver::~WebContentsAddedObserver() { 143 WebContentsAddedObserver::~WebContentsAddedObserver() {
143 WebContentsImpl::RemoveCreatedCallback(web_contents_created_callback_); 144 WebContentsImpl::FriendZone::RemoveCreatedCallbackForTesting(
145 web_contents_created_callback_);
144 } 146 }
145 147
146 void WebContentsAddedObserver::WebContentsCreated(WebContents* web_contents) { 148 void WebContentsAddedObserver::WebContentsCreated(WebContents* web_contents) {
147 DCHECK(!web_contents_); 149 DCHECK(!web_contents_);
148 web_contents_ = web_contents; 150 web_contents_ = web_contents;
149 child_observer_.reset(new RenderViewCreatedObserver(web_contents)); 151 child_observer_.reset(new RenderViewCreatedObserver(web_contents));
150 152
151 if (runner_.get()) 153 if (runner_.get())
152 runner_->QuitClosure().Run(); 154 runner_->QuitClosure().Run();
153 } 155 }
154 156
155 WebContents* WebContentsAddedObserver::GetWebContents() { 157 WebContents* WebContentsAddedObserver::GetWebContents() {
156 if (web_contents_) 158 if (web_contents_)
157 return web_contents_; 159 return web_contents_;
158 160
159 runner_ = new MessageLoopRunner(); 161 runner_ = new MessageLoopRunner();
160 runner_->Run(); 162 runner_->Run();
161 return web_contents_; 163 return web_contents_;
162 } 164 }
163 165
164 bool WebContentsAddedObserver::RenderViewCreatedCalled() { 166 bool WebContentsAddedObserver::RenderViewCreatedCalled() {
165 if (child_observer_) 167 if (child_observer_)
166 return child_observer_->render_view_created_called_; 168 return child_observer_->render_view_created_called_;
167 169
168 return false; 170 return false;
169 } 171 }
170 172
171 } // namespace content 173 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698