Index: extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc |
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_browsertest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc |
similarity index 61% |
rename from extensions/renderer/guest_view/mime_handler_view/mime_handler_view_browsertest.cc |
rename to extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc |
index d4c33d6c8da215288877bf582482ab75878acaf7..5b09caf3beeb4e9ff1b914dcf032c1b4b662fedb 100644 |
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_browsertest.cc |
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc |
@@ -10,6 +10,7 @@ |
#include "content/public/test/browser_test_utils.h" |
#include "extensions/browser/extension_registry.h" |
#include "extensions/test/result_catcher.h" |
+#include "net/test/embedded_test_server/embedded_test_server.h" |
// The test extension id is set by the key value in the manifest. |
const char* kExtensionId = "oickdpebdnfbgkcaoklfcdhjniefkcji"; |
@@ -19,8 +20,8 @@ class MimeHandlerViewTest : public ExtensionApiTest { |
~MimeHandlerViewTest() override {} |
const extensions::Extension* LoadTestExtension() { |
- const extensions::Extension* extension = LoadExtension( |
- test_data_dir_.AppendASCII("mime_handler_view")); |
+ const extensions::Extension* extension = |
+ LoadExtension(test_data_dir_.AppendASCII("mime_handler_view")); |
if (!extension) |
return nullptr; |
@@ -33,42 +34,36 @@ class MimeHandlerViewTest : public ExtensionApiTest { |
const extensions::Extension* extension = LoadTestExtension(); |
ASSERT_TRUE(extension); |
+ ASSERT_TRUE(StartEmbeddedTestServer()); |
+ embedded_test_server()->ServeFilesFromDirectory( |
+ test_data_dir_.AppendASCII("mime_handler_view")); |
+ |
extensions::ResultCatcher catcher; |
- GURL extension_url("chrome-extension://" + std::string(kExtensionId) + "/" + |
- path); |
- ui_test_utils::NavigateToURL(browser(), extension_url); |
+ ui_test_utils::NavigateToURL(browser(), |
+ embedded_test_server()->GetURL("/" + path)); |
if (!catcher.GetNextResult()) |
FAIL() << catcher.message(); |
} |
}; |
-// Not working on Windows because of crbug.com/443466. |
-#if defined(OS_WIN) |
-#define MAYBE_PostMessage DISABLED_PostMessage |
-#define MAYBE_Basic DISABLED_Basic |
-#define MAYBE_Embedded DISABLED_Embedded |
-#define MAYBE_Abort DISABLED_Abort |
-#else |
-#define MAYBE_PostMessage PostMessage |
-#define MAYBE_Basic Basic |
-#define MAYBE_Embedded Embedded |
-#define MAYBE_Abort Abort |
-#endif |
- |
-IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, MAYBE_PostMessage) { |
+IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, PostMessage) { |
RunTest("test_postmessage.html"); |
} |
-IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, MAYBE_Basic) { |
+IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, Basic) { |
RunTest("testBasic.csv"); |
} |
-IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, MAYBE_Embedded) { |
+IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, Embedded) { |
RunTest("test_embedded.html"); |
} |
-IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, MAYBE_Abort) { |
+IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, Iframe) { |
+ RunTest("test_iframe.html"); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(MimeHandlerViewTest, Abort) { |
RunTest("testAbort.csv"); |
} |