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

Side by Side Diff: content/browser/renderer_host/render_view_host_browsertest.cc

Issue 7096016: Remove JS dialog dependency from content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: now a tc delegate Created 9 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/time.h" 5 #include "base/time.h"
6 #include "base/utf_string_conversions.h"
6 #include "base/values.h" 7 #include "base/values.h"
7 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
9 #include "chrome/test/in_process_browser_test.h" 10 #include "chrome/test/in_process_browser_test.h"
10 #include "chrome/test/ui_test_utils.h" 11 #include "chrome/test/ui_test_utils.h"
11 #include "content/browser/renderer_host/render_view_host.h" 12 #include "content/browser/renderer_host/render_view_host.h"
12 #include "content/browser/tab_contents/tab_contents.h" 13 #include "content/browser/tab_contents/tab_contents.h"
13 #include "content/browser/tab_contents/tab_contents_observer.h" 14 #include "content/browser/tab_contents/tab_contents_observer.h"
14 #include "content/common/view_messages.h" 15 #include "content/common/view_messages.h"
15 #include "net/base/host_port_pair.h" 16 #include "net/base/host_port_pair.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 RenderViewHostTestTabContentsObserver observer( 238 RenderViewHostTestTabContentsObserver observer(
238 browser()->GetSelectedTabContents()); 239 browser()->GetSelectedTabContents());
239 240
240 GURL test_url = test_server()->GetURL("files/simple.html"); 241 GURL test_url = test_server()->GetURL("files/simple.html");
241 ui_test_utils::NavigateToURL(browser(), test_url); 242 ui_test_utils::NavigateToURL(browser(), test_url);
242 243
243 EXPECT_EQ(test_server()->host_port_pair().ToString(), 244 EXPECT_EQ(test_server()->host_port_pair().ToString(),
244 observer.observed_socket_address().ToString()); 245 observer.observed_socket_address().ToString());
245 EXPECT_EQ(1, observer.navigation_count()); 246 EXPECT_EQ(1, observer.navigation_count());
246 } 247 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698