Unverified Commit d14a9eaa authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove chrome launcher, analytics mock from web unit tests (#77066)

parent ea8e6161
......@@ -569,7 +569,7 @@ class _ResidentWebRunner extends ResidentWebRunner {
String reason,
bool benchmarkMode = false,
}) async {
final Stopwatch timer = Stopwatch()..start();
final DateTime start = globals.systemClock.now();
final Status status = globals.logger.startProgress(
'Performing hot restart...',
progressId: 'hot.restart',
......@@ -620,12 +620,13 @@ class _ResidentWebRunner extends ResidentWebRunner {
status.stop();
}
final String elapsed = getElapsedAsMilliseconds(timer.elapsed);
globals.printStatus('Restarted application in $elapsed.');
final Duration elapsed = globals.systemClock.now().difference(start);
final String elapsedMS = getElapsedAsMilliseconds(elapsed);
globals.printStatus('Restarted application in $elapsedMS.');
// Don't track restart times for dart2js builds or web-server devices.
if (debuggingOptions.buildInfo.isDebug && deviceIsDebuggable) {
globals.flutterUsage.sendTiming('hot', 'web-incremental-restart', timer.elapsed);
globals.flutterUsage.sendTiming('hot', 'web-incremental-restart', elapsed);
HotEvent(
'restart',
targetPlatform: getNameForTargetPlatform(TargetPlatform.web_javascript),
......@@ -633,7 +634,7 @@ class _ResidentWebRunner extends ResidentWebRunner {
emulator: false,
fullRestart: true,
reason: reason,
overallTimeInMs: timer.elapsed.inMilliseconds,
overallTimeInMs: elapsed.inMilliseconds,
fastReassemble: null,
).send();
}
......
......@@ -134,14 +134,10 @@ class ChromiumLauncher {
final BrowserFinder _browserFinder;
final Logger _logger;
bool get hasChromeInstance => _currentCompleter.isCompleted;
Completer<Chromium> _currentCompleter = Completer<Chromium>();
bool get hasChromeInstance => currentCompleter.isCompleted;
@visibleForTesting
void testLaunchChromium(Chromium chromium) {
_currentCompleter.complete(chromium);
}
Completer<Chromium> currentCompleter = Completer<Chromium>();
/// Whether we can locate the chrome executable.
bool canFindExecutable() {
......@@ -171,7 +167,7 @@ class ChromiumLauncher {
bool skipCheck = false,
Directory cacheDir,
}) async {
if (_currentCompleter.isCompleted) {
if (currentCompleter.isCompleted) {
throwToolExit('Only one instance of chrome can be started.');
}
......@@ -226,7 +222,7 @@ class ChromiumLauncher {
_cacheUserSessionInformation(userDataDir, cacheDir);
}));
}
return _connect(Chromium._(
return _connect(Chromium(
port,
ChromeConnection('localhost', port),
url: url,
......@@ -358,16 +354,16 @@ class ChromiumLauncher {
'Unable to connect to Chrome debug port: ${chrome.debugPort}\n $e');
}
}
_currentCompleter.complete(chrome);
currentCompleter.complete(chrome);
return chrome;
}
Future<Chromium> get connectedInstance => _currentCompleter.future;
Future<Chromium> get connectedInstance => currentCompleter.future;
}
/// A class for managing an instance of a Chromium browser.
class Chromium {
Chromium._(
Chromium(
this.debugPort,
this.chromeConnection, {
this.url,
......@@ -386,7 +382,7 @@ class Chromium {
Future<void> close() async {
if (_chromiumLauncher.hasChromeInstance) {
_chromiumLauncher._currentCompleter = Completer<Chromium>();
_chromiumLauncher.currentCompleter = Completer<Chromium>();
}
chromeConnection.close();
_process?.kill();
......
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