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

Unified Diff: chrome/browser/chrome_find_request_manager_browsertest.cc

Issue 2808923003: Revert of Enable find-in-page across GuestViews. (Closed)
Patch Set: Fixed patch conflicts. Created 3 years, 8 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: chrome/browser/chrome_find_request_manager_browsertest.cc
diff --git a/chrome/browser/chrome_find_request_manager_browsertest.cc b/chrome/browser/chrome_find_request_manager_browsertest.cc
index 0ced9a2807ab234b669b3de13a1910009dac1a82..36a9791342b2673e895619d498792a4d4363d7a6 100644
--- a/chrome/browser/chrome_find_request_manager_browsertest.cc
+++ b/chrome/browser/chrome_find_request_manager_browsertest.cc
@@ -9,8 +9,6 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_plugin_guest_manager.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/find_test_utils.h"
@@ -85,7 +83,7 @@ class ChromeFindRequestManagerTest : public InProcessBrowserTest {
// Tests searching in a full-page PDF.
IN_PROC_BROWSER_TEST_F(ChromeFindRequestManagerTest, FindInPDF) {
LoadAndWait("/find_in_pdf_page.pdf");
- ASSERT_TRUE(pdf_extension_test_util::EnsurePDFHasLoaded(contents()));
+ pdf_extension_test_util::EnsurePDFHasLoaded(contents());
blink::WebFindOptions options;
Find("result", options);
@@ -100,31 +98,4 @@ IN_PROC_BROWSER_TEST_F(ChromeFindRequestManagerTest, FindInPDF) {
EXPECT_EQ(3, results.active_match_ordinal);
}
-// Tests searching in a page with embedded PDFs. Note that this test, the
-// FindInPDF test, and the find tests in web_view_browsertest.cc ensure that
-// find-in-page works across GuestViews.
-//
-// TODO(paulmeyer): Note that this is left disabled for now since
-// EnsurePDFHasLoaded() currently does not work for embedded PDFs. This will be
-// fixed and enabled in a subsequent patch.
-IN_PROC_BROWSER_TEST_F(ChromeFindRequestManagerTest,
- DISABLED_FindInEmbeddedPDFs) {
- LoadAndWait("/find_in_embedded_pdf_page.html");
- ASSERT_TRUE(pdf_extension_test_util::EnsurePDFHasLoaded(contents()));
-
- blink::WebFindOptions options;
- Find("result", options);
- options.find_next = true;
- options.forward = false;
- Find("result", options);
- Find("result", options);
- Find("result", options);
- delegate()->WaitForFinalReply();
-
- FindResults results = delegate()->GetFindResults();
- EXPECT_EQ(last_request_id(), results.request_id);
- EXPECT_EQ(13, results.number_of_matches);
- EXPECT_EQ(11, results.active_match_ordinal);
-}
-
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698