Commit 537c1983 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

WebUI: Stop loading chrome://downloads in managed-footnote tests.

The test was loading chrome://downloads only so that loadTimeData is
initialized, but that's unnecessary and causes this test to break when
chrome://downloads is ported to Polymer3.

Bug: 1022215
Change-Id: Icea9f16913b1e9f9d8154f5cc1242004218cfb2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1919569Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715953}
parent 50c854cf
...@@ -47,16 +47,6 @@ void TestDataSource::StartDataRequest( ...@@ -47,16 +47,6 @@ void TestDataSource::StartDataRequest(
const content::WebContents::Getter& wc_getter, const content::WebContents::Getter& wc_getter,
const content::URLDataSource::GotDataCallback& callback) { const content::URLDataSource::GotDataCallback& callback) {
const std::string path = content::URLDataSource::URLToRequestPath(url); const std::string path = content::URLDataSource::URLToRequestPath(url);
// TODO(crbug/1009127): Make ReadFile take GURL().
if (path == "strings.m.js") {
std::string output = "import {loadTimeData} from ";
output.append("'chrome://resources/js/load_time_data.m.js';\n");
output.append("loadTimeData.data = {};");
scoped_refptr<base::RefCountedString> response =
base::RefCountedString::TakeString(&output);
callback.Run(response.get());
return;
}
base::PostTask( base::PostTask(
FROM_HERE, FROM_HERE,
{base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_BLOCKING}, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_BLOCKING},
......
...@@ -43,7 +43,8 @@ CrComponentsManagedFootnoteTest.prototype = { ...@@ -43,7 +43,8 @@ CrComponentsManagedFootnoteTest.prototype = {
__proto__: CrComponentsBrowserTest.prototype, __proto__: CrComponentsBrowserTest.prototype,
/** @override */ /** @override */
browsePreload: 'chrome://downloads', browsePreload:
'chrome://resources/cr_components/managed_footnote/managed_footnote.html',
/** @override */ /** @override */
extraLibraries: CrComponentsBrowserTest.prototype.extraLibraries.concat([ extraLibraries: CrComponentsBrowserTest.prototype.extraLibraries.concat([
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
// clang-format off // clang-format off
// #import 'chrome://resources/cr_components/managed_footnote/managed_footnote.m.js'; // #import 'chrome://resources/cr_components/managed_footnote/managed_footnote.m.js';
// //
// #import '../strings.m.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// #import {isChromeOS} from 'chrome://resources/js/cr.m.js'; // #import {isChromeOS} from 'chrome://resources/js/cr.m.js';
// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; // #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
...@@ -25,11 +24,11 @@ cr.define('managed_footnote_test', function() { ...@@ -25,11 +24,11 @@ cr.define('managed_footnote_test', function() {
const suiteName = 'ManagedFootnoteTest'; const suiteName = 'ManagedFootnoteTest';
suite(suiteName, function() { suite(suiteName, function() {
setup(function() { suiteSetup(function() {
PolymerTest.clearBody(); loadTimeData.data = {};
}); });
teardown(function() { setup(function() {
PolymerTest.clearBody(); PolymerTest.clearBody();
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment