| Index: chrome/renderer/chrome_content_renderer_client_browsertest.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client_browsertest.cc b/chrome/renderer/chrome_content_renderer_client_browsertest.cc
|
| index e61b4f99d56e902d55312f341ddf11f5705021e7..e04e8e7363c92cab9b34efece923d59932eac3a2 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client_browsertest.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client_browsertest.cc
|
| @@ -10,18 +10,27 @@
|
| #include "base/command_line.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| +#include "chrome/browser/ui/browser.h"
|
| +#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/render_messages.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "chrome/renderer/chrome_content_renderer_client.h"
|
| #include "chrome/test/base/chrome_render_view_test.h"
|
| +#include "chrome/test/base/in_process_browser_test.h"
|
| +#include "chrome/test/base/ui_test_utils.h"
|
| #include "content/public/common/content_constants.h"
|
| #include "content/public/renderer/render_frame.h"
|
| #include "content/public/renderer/render_view.h"
|
| +#include "content/public/test/browser_test_utils.h"
|
| #include "content/public/test/mock_render_thread.h"
|
| +#include "content/public/test/test_utils.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_sender.h"
|
| #include "ipc/ipc_test_sink.h"
|
| +#include "net/dns/mock_host_resolver.h"
|
| +#include "net/test/embedded_test_server/http_request.h"
|
| +#include "net/test/embedded_test_server/http_response.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "third_party/WebKit/public/web/WebLocalFrame.h"
|
| #include "third_party/WebKit/public/web/WebPluginParams.h"
|
| @@ -33,6 +42,9 @@ using testing::SetArgPointee;
|
|
|
| typedef ChromeRenderViewTest InstantProcessNavigationTest;
|
|
|
| +const base::FilePath::CharType kDocRoot[] =
|
| + FILE_PATH_LITERAL("chrome/test/data");
|
| +
|
| // Tests that renderer-initiated navigations from an Instant render process get
|
| // bounced back to the browser to be rebucketed into a non-Instant renderer if
|
| // necessary.
|
| @@ -70,3 +82,95 @@ TEST_F(InstantProcessNavigationTest, ForkForNavigationsToSearchURLs) {
|
| GetMainFrame(), GURL("http://example.com/"), "GET", false, false,
|
| &unused));
|
| }
|
| +
|
| +class ChromeContentRendererClientBrowserTest : public InProcessBrowserTest {
|
| + public:
|
| + void MonitorRequestHandler(const net::test_server::HttpRequest& request) {
|
| + // We're only interested in YouTube video embeds
|
| + if (request.headers.at("Host").find("youtube.com") == std::string::npos)
|
| + return;
|
| +
|
| + if (request.relative_url.find("/embed") != 0 &&
|
| + request.relative_url.find("/v") != 0)
|
| + return;
|
| +
|
| + auto type = request.headers.find("Accept");
|
| + EXPECT_NE(std::string::npos, type->second.find("text/html"));
|
| +
|
| + EXPECT_EQ(request.relative_url, expected_url_);
|
| + content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
|
| + message_runner_->QuitClosure());
|
| + }
|
| +
|
| + void WaitForYouTubeRequest() {
|
| + message_runner_ = new content::MessageLoopRunner();
|
| + message_runner_->Run();
|
| + }
|
| +
|
| + void set_expected_url(std::string given) { expected_url_ = given; }
|
| +
|
| + private:
|
| + std::string expected_url_;
|
| + scoped_refptr<content::MessageLoopRunner> message_runner_;
|
| +};
|
| +
|
| +// These tests examine Youtube requests that use the Flash API and ensure that
|
| +// the requests have been modified to instead use HTML5. The tests also check
|
| +// the MIME type of the request to ensure that it is "text/html".
|
| +IN_PROC_BROWSER_TEST_F(ChromeContentRendererClientBrowserTest,
|
| + RewriteYouTubeFlashEmbed) {
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
| +
|
| + host_resolver()->AddRule("*", "127.0.0.1");
|
| +
|
| + embedded_test_server()->ServeFilesFromSourceDirectory(
|
| + base::FilePath(kDocRoot));
|
| + embedded_test_server()->RegisterRequestMonitor(
|
| + base::Bind(&ChromeContentRendererClientBrowserTest::MonitorRequestHandler,
|
| + base::Unretained(this)));
|
| +
|
| + GURL url(embedded_test_server()->GetURL("/flash_embeds.html"));
|
| +
|
| + ui_test_utils::NavigateToURL(browser(), url);
|
| +
|
| + content::WebContents* web_contents =
|
| + browser()->tab_strip_model()->GetActiveWebContents();
|
| + std::string port = std::to_string(embedded_test_server()->port());
|
| +
|
| + // Valid URL, no parameters
|
| + std::string video_url = "http://www.youtube.com:" + port + "/v/deadbeef";
|
| + std::string mime_type = "application/x-shockwave-flash";
|
| + set_expected_url("/embed/deadbeef");
|
| + EXPECT_TRUE(ExecuteScript(
|
| + web_contents, "appendToDOM('" + video_url + "','" + mime_type + "');"));
|
| + WaitForYouTubeRequest();
|
| +
|
| + // Valid URL, no parameters, subdomain
|
| + video_url = "http://www.foo.youtube.com:" + port + "/v/deadbeef";
|
| + set_expected_url("/embed/deadbeef");
|
| + EXPECT_TRUE(ExecuteScript(
|
| + web_contents, "appendToDOM('" + video_url + "','" + mime_type + "');"));
|
| + WaitForYouTubeRequest();
|
| +
|
| + // Valid URL, many parameters
|
| + video_url = "http://www.youtube.com:" + port + "/v/deadbeef?start=4&fs=1";
|
| + set_expected_url("/embed/deadbeef?start=4&fs=1");
|
| + EXPECT_TRUE(ExecuteScript(
|
| + web_contents, "appendToDOM('" + video_url + "','" + mime_type + "');"));
|
| + WaitForYouTubeRequest();
|
| +
|
| + // Invalid parameter construct, many parameters
|
| + video_url = "http://www.youtube.com:" + port + "/v/deadbeef&bar=4&foo=6";
|
| + set_expected_url("/embed/deadbeef?bar=4&foo=6");
|
| + EXPECT_TRUE(ExecuteScript(
|
| + web_contents, "appendToDOM('" + video_url + "','" + mime_type + "');"));
|
| + WaitForYouTubeRequest();
|
| +
|
| + // Valid URL, enablejsapi=1
|
| + video_url = "http://www.youtube.com:" + port + "/v/deadbeef?enablejsapi=1";
|
| + mime_type = "";
|
| + set_expected_url("/v/deadbeef?enablejsapi=1");
|
| + EXPECT_TRUE(ExecuteScript(
|
| + web_contents, "appendToDOM('" + video_url + "','" + mime_type + "');"));
|
| + WaitForYouTubeRequest();
|
| +}
|
|
|