Enable devtools formatter tests for frontend change

Frontend CL: http://crrev.com/c/2456592
Disable CL: http://crrev.com/c/2461340

Bug: 1136848
Change-Id: I4117a51202dfc0ca9ec0eb31534de3300772809f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462084Reviewed-by: Alex Rudenko <alexrudenko@chromium.org>
Commit-Queue: Peter Marshall <petermarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816562}

third_party/blink/web_tests/TestExpectations

@@ -5882,13 +5882,6 @@ crbug.com/1043675 [ Win ] svg/custom/svg-root-with-opacity.html [ Failure ]
 crbug.com/106759 http/tests/devtools/command-line-api-inspect.js [ Pass Failure ]
 crbug.com/106759 http/tests/devtools/sources/debugger-console/debugger-command-line-api.js [ Pass Failure ]
 
-# Temporarily disabled to land DevTools change
-crbug.com/1136848 http/tests/devtools/sources/formatter-css.js [ Pass Failure ]
-crbug.com/1136848 http/tests/devtools/sources/formatter-js.js [ Pass Failure ]
-crbug.com/1136848 http/tests/devtools/sources/inline-styles-scripts-locations.js [ Pass Failure ]
-crbug.com/1136848 http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-2.js [ Pass Failure ]
-crbug.com/1136848 http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-3.js [ Pass Failure ]
-
 crbug.com/989665 [ Mac ] external/wpt/resource-timing/resource_timing_buffer_full_eventually.html [ Crash Pass ]
 crbug.com/989665 [ Linux ] virtual/omt-worker-fetch/external/wpt/resource-timing/resource_timing_buffer_full_eventually.html [ Crash Pass ]
 crbug.com/989665 [ Win ] virtual/omt-worker-fetch/external/wpt/resource-timing/resource_timing_buffer_full_eventually.html [ Pass Timeout ]

third_party/blink/web_tests/http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-2.js

@@ -49,7 +49,7 @@
             .then(() => SourcesTestRunner.dumpBreakpointSidebarPane('while paused in raw'))
             .then(() => SourcesTestRunner.resumeExecution(next));
         SourcesTestRunner.removeBreakpoint(formattedSourceFrame, 3);
-        await Formatter.sourceFormatter.discardFormattedUISourceCode(panel.visibleView.uiSourceCode());
+        await Formatter.SourceFormatter.instance().discardFormattedUISourceCode(panel.visibleView.uiSourceCode());
       }
     }
   ]);

third_party/blink/web_tests/http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-3.js

@@ -49,7 +49,7 @@
             .then(() => SourcesTestRunner.dumpBreakpointSidebarPane('while paused in raw'))
             .then(() => SourcesTestRunner.resumeExecution(next));
         // No need to remove breakpoint since formattedUISourceCode was removed.
-        await Formatter.sourceFormatter.discardFormattedUISourceCode(panel.visibleView.uiSourceCode());
+        await Formatter.SourceFormatter.instance().discardFormattedUISourceCode(panel.visibleView.uiSourceCode());
       }
     }
   ]);

third_party/blink/web_tests/http/tests/devtools/sources/formatter-css.js

@@ -9,7 +9,7 @@
   await TestRunner.addStylesheetTag('resources/style-formatter-obfuscated.css');
 
   var uiSourceCode = await TestRunner.waitForUISourceCode('style-formatter-obfuscated.css');
-  var formatData = await Formatter.sourceFormatter.format(uiSourceCode);
+  var formatData = await Formatter.SourceFormatter.instance().format(uiSourceCode);
   var targetContent = (await formatData.formattedSourceCode.requestContent()).content;
 
   TestRunner.addResult(`Formatted:\n${targetContent}`);
@@ -33,7 +33,7 @@
   TestRunner.addResult('Location mapping with formatted source:');
   await dumpLocations();
 
-  await Formatter.sourceFormatter.discardFormattedUISourceCode(formatData.formattedSourceCode);
+  await Formatter.SourceFormatter.instance().discardFormattedUISourceCode(formatData.formattedSourceCode);
 
   TestRunner.addResult('Location mapping without formatted source:');
   await dumpLocations();

third_party/blink/web_tests/http/tests/devtools/sources/formatter-js.js

@@ -9,7 +9,7 @@
   await TestRunner.addScriptTag('debugger/resources/obfuscated.js');
 
   var uiSourceCode = await TestRunner.waitForUISourceCode('obfuscated.js');
-  var formatData = await Formatter.sourceFormatter.format(uiSourceCode);
+  var formatData = await Formatter.SourceFormatter.instance().format(uiSourceCode);
   var targetContent = (await formatData.formattedSourceCode.requestContent()).content;
 
   TestRunner.addResult(`Formatted:\n${targetContent}`);
@@ -24,7 +24,7 @@
   TestRunner.addResult('Location mapping with formatted source:');
   await dumpLocations(positions);
 
-  await Formatter.sourceFormatter.discardFormattedUISourceCode(formatData.formattedSourceCode);
+  await Formatter.SourceFormatter.instance().discardFormattedUISourceCode(formatData.formattedSourceCode);
 
   TestRunner.addResult('Location mapping without formatted source:');
   await dumpLocations(positions);

third_party/blink/web_tests/http/tests/devtools/sources/inline-styles-scripts-locations.js

@@ -18,7 +18,7 @@
 
   TestRunner.addResult("\n\nFormatting source now...\n\n");
 
-  const formatData = await Formatter.sourceFormatter.format(source);
+  const formatData = await Formatter.SourceFormatter.instance().format(source);
   const formattedSource = formatData.formattedSourceCode;
   var formattedContent = (await formatData.formattedSourceCode.requestContent()).content;
   TestRunner.addResult(`Formatted Content:\n${formattedContent}`);