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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 1831423003: Audit test code callsites that need an explicit lifecycle update. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up. Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/chrome_render_frame_observer.cc ('k') | content/renderer/render_view_browsertest_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 1ec29e2e4bb415146c2d72df96d25e351d18f0db..42a4b3781b874aedd51ec8d50fd6d8476eb226e9 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -1277,8 +1277,8 @@ TEST_F(RenderViewImplTest, ImeComposition) {
// Retrieve the content of this page and compare it with the expected
// result.
const int kMaxOutputCharacters = 128;
- base::string16 output = WebFrameContentDumper::dumpFrameTreeAsText(
- GetMainFrame(), kMaxOutputCharacters);
+ base::string16 output = WebFrameContentDumper::dumpWebViewAsText(
+ view()->GetWebView(), kMaxOutputCharacters);
EXPECT_EQ(base::WideToUTF16(ime_message->result), output);
}
}
@@ -1326,8 +1326,8 @@ TEST_F(RenderViewImplTest, OnSetTextDirection) {
// Copy the document content to std::wstring and compare with the
// expected result.
const int kMaxOutputCharacters = 16;
- base::string16 output = WebFrameContentDumper::dumpFrameTreeAsText(
- GetMainFrame(), kMaxOutputCharacters);
+ base::string16 output = WebFrameContentDumper::dumpWebViewAsText(
+ view()->GetWebView(), kMaxOutputCharacters);
EXPECT_EQ(base::WideToUTF16(kTextDirection[i].expected_result), output);
}
}
@@ -1669,8 +1669,8 @@ TEST_F(RenderViewImplTest, NavigateSubframe) {
// expected result.
const int kMaxOutputCharacters = 256;
std::string output = base::UTF16ToUTF8(
- base::StringPiece16(WebFrameContentDumper::dumpFrameTreeAsText(
- GetMainFrame(), kMaxOutputCharacters)));
+ base::StringPiece16(WebFrameContentDumper::dumpWebViewAsText(
+ view()->GetWebView(), kMaxOutputCharacters)));
EXPECT_EQ(output, "hello \n\nworld");
}
@@ -1790,8 +1790,8 @@ TEST_F(RendererErrorPageTest, MAYBE_Suppresses) {
blink::WebStandardCommit);
const int kMaxOutputCharacters = 22;
EXPECT_EQ("", base::UTF16ToASCII(base::StringPiece16(
- WebFrameContentDumper::dumpFrameTreeAsText(
- web_frame, kMaxOutputCharacters))));
+ WebFrameContentDumper::dumpWebViewAsText(
+ view()->GetWebView(), kMaxOutputCharacters))));
}
#if defined(OS_ANDROID)
@@ -1826,8 +1826,8 @@ TEST_F(RendererErrorPageTest, MAYBE_DoesNotSuppress) {
const int kMaxOutputCharacters = 22;
EXPECT_EQ("A suffusion of yellow.",
base::UTF16ToASCII(
- base::StringPiece16(WebFrameContentDumper::dumpFrameTreeAsText(
- web_frame, kMaxOutputCharacters))));
+ base::StringPiece16(WebFrameContentDumper::dumpWebViewAsText(
+ view()->GetWebView(), kMaxOutputCharacters))));
}
#if defined(OS_ANDROID)
@@ -1862,8 +1862,8 @@ TEST_F(RendererErrorPageTest, MAYBE_HttpStatusCodeErrorWithEmptyBody) {
const int kMaxOutputCharacters = 22;
EXPECT_EQ("A suffusion of yellow.",
base::UTF16ToASCII(
- base::StringPiece16(WebFrameContentDumper::dumpFrameTreeAsText(
- web_frame, kMaxOutputCharacters))));
+ base::StringPiece16(WebFrameContentDumper::dumpWebViewAsText(
+ view()->GetWebView(), kMaxOutputCharacters))));
}
// Ensure the render view sends favicon url update events correctly.
« no previous file with comments | « chrome/renderer/chrome_render_frame_observer.cc ('k') | content/renderer/render_view_browsertest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698