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

Unified Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 17165004: <webview>: Partially migrate loadcommit event from content to chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with ToT Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
index adcb9489a3fda5bbdb7de22105f5b7bcb8f66b9f..134705eeede78c083d091f5407b8348557349e5c 100644
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -1128,29 +1128,6 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadStop) {
EXPECT_EQ(expected_title, actual_title);
}
-IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadCommit) {
- const char* kEmbedderURL = "/browser_plugin_embedder.html";
- StartBrowserPluginTest(kEmbedderURL, "about:blank", true, std::string());
-
- const string16 expected_title = ASCIIToUTF16(
- base::StringPrintf("loadCommit:%s", kHTMLForGuest));
- content::TitleWatcher title_watcher(
- test_embedder()->web_contents(), expected_title);
- // Renavigate the guest to |kHTMLForGuest|.
- RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
- test_embedder()->web_contents()->GetRenderViewHost());
- ExecuteSyncJSFunction(rvh,
- base::StringPrintf("SetSrc('%s');", kHTMLForGuest));
-
- string16 actual_title = title_watcher.WaitAndGetTitle();
- EXPECT_EQ(expected_title, actual_title);
- scoped_ptr<base::Value> is_top_level =
- content::ExecuteScriptAndGetValue(rvh, "commitIsTopLevel");
- bool top_level_bool = false;
- EXPECT_TRUE(is_top_level->GetAsBoolean(&top_level_bool));
- EXPECT_EQ(true, top_level_bool);
-}
-
// This test verifies that if a browser plugin is hidden before navigation,
// the guest starts off hidden.
IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, HiddenBeforeNavigation) {
« no previous file with comments | « chrome/renderer/resources/extensions/web_view.js ('k') | content/common/browser_plugin/browser_plugin_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698