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

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

Issue 10539134: TabContentsWrapper -> TabContents, part 57. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last use Created 8 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) 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 "base/time.h" 5 #include "base/time.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 15 matching lines...) Expand all
26 }; 26 };
27 27
28 28
29 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, 29 IN_PROC_BROWSER_TEST_F(RenderViewHostTest,
30 ExecuteJavascriptAndGetValue) { 30 ExecuteJavascriptAndGetValue) {
31 ASSERT_TRUE(test_server()->Start()); 31 ASSERT_TRUE(test_server()->Start());
32 GURL empty_url(test_server()->GetURL("files/empty.html")); 32 GURL empty_url(test_server()->GetURL("files/empty.html"));
33 ui_test_utils::NavigateToURL(browser(), empty_url); 33 ui_test_utils::NavigateToURL(browser(), empty_url);
34 34
35 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( 35 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
36 browser()->GetSelectedWebContents()->GetRenderViewHost()); 36 browser()->GetActiveWebContents()->GetRenderViewHost());
37 37
38 { 38 {
39 Value* value = rvh->ExecuteJavascriptAndGetValue(string16(), 39 Value* value = rvh->ExecuteJavascriptAndGetValue(string16(),
40 ASCIIToUTF16("!false;")); 40 ASCIIToUTF16("!false;"));
41 EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType()); 41 EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType());
42 bool bool_value; 42 bool bool_value;
43 EXPECT_TRUE(value->GetAsBoolean(&bool_value)); 43 EXPECT_TRUE(value->GetAsBoolean(&bool_value));
44 EXPECT_TRUE(bool_value); 44 EXPECT_TRUE(bool_value);
45 } 45 }
46 46
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 net::HostPortPair observed_socket_address_; 194 net::HostPortPair observed_socket_address_;
195 GURL base_url_; 195 GURL base_url_;
196 int navigation_count_; 196 int navigation_count_;
197 197
198 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestWebContentsObserver); 198 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestWebContentsObserver);
199 }; 199 };
200 200
201 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) { 201 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {
202 ASSERT_TRUE(test_server()->Start()); 202 ASSERT_TRUE(test_server()->Start());
203 RenderViewHostTestWebContentsObserver observer( 203 RenderViewHostTestWebContentsObserver observer(
204 browser()->GetSelectedWebContents()); 204 browser()->GetActiveWebContents());
205 205
206 GURL test_url = test_server()->GetURL("files/simple.html"); 206 GURL test_url = test_server()->GetURL("files/simple.html");
207 ui_test_utils::NavigateToURL(browser(), test_url); 207 ui_test_utils::NavigateToURL(browser(), test_url);
208 208
209 EXPECT_EQ(test_server()->host_port_pair().ToString(), 209 EXPECT_EQ(test_server()->host_port_pair().ToString(),
210 observer.observed_socket_address().ToString()); 210 observer.observed_socket_address().ToString());
211 EXPECT_EQ(1, observer.navigation_count()); 211 EXPECT_EQ(1, observer.navigation_count());
212 } 212 }
213 213
214 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) { 214 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {
215 ASSERT_TRUE(test_server()->Start()); 215 ASSERT_TRUE(test_server()->Start());
216 RenderViewHostTestWebContentsObserver observer( 216 RenderViewHostTestWebContentsObserver observer(
217 browser()->GetSelectedWebContents()); 217 browser()->GetActiveWebContents());
218 218
219 // Base URL is not set if it is the same as the URL. 219 // Base URL is not set if it is the same as the URL.
220 GURL test_url = test_server()->GetURL("files/simple.html"); 220 GURL test_url = test_server()->GetURL("files/simple.html");
221 ui_test_utils::NavigateToURL(browser(), test_url); 221 ui_test_utils::NavigateToURL(browser(), test_url);
222 EXPECT_TRUE(observer.base_url().is_empty()); 222 EXPECT_TRUE(observer.base_url().is_empty());
223 EXPECT_EQ(1, observer.navigation_count()); 223 EXPECT_EQ(1, observer.navigation_count());
224 224
225 // But should be set to the original page when reading MHTML. 225 // But should be set to the original page when reading MHTML.
226 test_url = net::FilePathToFileURL(test_server()->document_root().Append( 226 test_url = net::FilePathToFileURL(test_server()->document_root().Append(
227 FILE_PATH_LITERAL("google.mht"))); 227 FILE_PATH_LITERAL("google.mht")));
228 ui_test_utils::NavigateToURL(browser(), test_url); 228 ui_test_utils::NavigateToURL(browser(), test_url);
229 EXPECT_EQ("http://www.google.com/", observer.base_url().spec()); 229 EXPECT_EQ("http://www.google.com/", observer.base_url().spec());
230 } 230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698