Prevent tests using data URLs from being broken by data URL deprecation

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

 // Copyright 2013 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.
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 158 matching lines @@
   // then opens the blocked popup. Once the popup stopped loading, verifies
   // that the title of the page is "PASS" if |check_title| is set.
   //
   // If |what_to_expect| is ExpectPopup, the popup is expected to open a new
   // window, or a background tab if it is false.
   //
   // Returns the WebContents of the launched popup.
   WebContents* RunCheckTest(Browser* browser,
                             const std::string& test_name,
                             WhatToExpect what_to_expect,
-                            ShouldCheckTitle check_title) {
+                            ShouldCheckTitle check_title,
+                            const base::string16& expected_title) {
     GURL url(embedded_test_server()->GetURL(test_name));
 
     CountRenderViewHosts counter;
 
     ui_test_utils::NavigateToURL(browser, url);
 
     // Since the popup blocker blocked the window.open, there should be only one
     // tab.
     EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile()));
     EXPECT_EQ(1, browser->tab_strip_model()->count());
@@ skipping 32 matching lines @@
     } else {
       new_browser = browser;
       EXPECT_EQ(2, browser->tab_strip_model()->count());
       // Check that we always create foreground tabs.
       EXPECT_EQ(1, browser->tab_strip_model()->active_index());
       web_contents = browser->tab_strip_model()->GetWebContentsAt(1);
     }
 
     if (check_title == CheckTitle) {
       // Check that the check passed.
-      base::string16 expected_title(base::ASCIIToUTF16("PASS"));
       content::TitleWatcher title_watcher(web_contents, expected_title);
       EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
     }
 
     return web_contents;
   }
 
+  WebContents* RunCheckTest(Browser* browser,
+                            const std::string& test_name,
+                            WhatToExpect what_to_expect,
+                            ShouldCheckTitle check_title) {
+    return RunCheckTest(browser, test_name, what_to_expect, check_title,
+                        base::ASCIIToUTF16("PASS"));
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(PopupBlockerBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
                        BlockWebContentsCreation) {
   RunCheckTest(
       browser(),
       "/popup_blocker/popup-blocked-to-post-blank.html",
       ExpectTab,
@@ skipping 111 matching lines @@
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
   WaitForHistoryBackendToRun(browser()->profile());
 
   std::string search_string =
       "data:text/html,<title>Popup Success!</title>you should not see this "
       "message if popup blocker is enabled";
 
   ui_test_utils::HistoryEnumerator history(browser()->profile());
   std::vector<GURL>& history_urls = history.urls();
   ASSERT_EQ(2u, history_urls.size());
-  ASSERT_EQ(GURL(search_string), history_urls[0]);
+  ASSERT_EQ(embedded_test_server()->GetURL("/popup_blocker/popup-success.html"),
+            history_urls[0]);
   ASSERT_EQ(url, history_urls[1]);
 
   TemplateURLService* service = TemplateURLServiceFactory::GetForProfile(
       browser()->profile());
   search_test_utils::WaitForTemplateURLServiceToLoad(service);
   LocationBar* location_bar = browser()->window()->GetLocationBar();
   ui_test_utils::SendToOmniboxAndSubmit(location_bar, search_string);
   OmniboxEditModel* model = location_bar->GetOmniboxView()->model();
   EXPECT_EQ(GURL(search_string), model->CurrentMatch(NULL).destination_url);
   EXPECT_EQ(base::ASCIIToUTF16(search_string),
@@ skipping 81 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, OpenerSuppressed) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-openersuppressed.html",
                ExpectTab,
                CheckTitle);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ShiftClick) {
-  RunCheckTest(
-      browser(),
-      "/popup_blocker/popup-fake-click-on-anchor3.html",
-      ExpectPopup,
-      CheckTitle);
+  RunCheckTest(browser(), "/popup_blocker/popup-fake-click-on-anchor3.html",
+               ExpectPopup, CheckTitle, base::ASCIIToUTF16("Popup Success!"));
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, WebUI) {
   WebContents* popup =
       RunCheckTest(browser(),
                    "/popup_blocker/popup-webui.html",
                    ExpectTab,
                    DontCheckTitle);
 
   // Check that the new popup displays about:blank.
@@ skipping 383 matching lines @@
 
   wait_for_new_tab.Wait();
 
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
   // Check that we create the background tab.
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 }
 
 }  // namespace