Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(419)

Unified Diff: content/browser/devtools/devtools_manager.cc

Issue 615533002: Fix DevToolsManagerTest.TestObserver flakiness. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/devtools/devtools_manager.h ('k') | content/browser/devtools/devtools_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/devtools/devtools_manager.cc
diff --git a/content/browser/devtools/devtools_manager.cc b/content/browser/devtools/devtools_manager.cc
index 3b24d5d70c0d526b2170934693241c9746a8712c..f405185a24d3c43c8165cf1a6a65a843d8330ee1 100644
--- a/content/browser/devtools/devtools_manager.cc
+++ b/content/browser/devtools/devtools_manager.cc
@@ -14,6 +14,12 @@
namespace content {
+namespace {
+
+int kObserverThrottleInterval = 500; // ms
+
+} // namespace
+
// static
DevToolsManager* DevToolsManager::GetInstance() {
return Singleton<DevToolsManager>::get();
@@ -91,10 +97,14 @@ void DevToolsManager::UpdateTargetListThrottled() {
}
update_target_list_scheduled_ = true;
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- update_target_list_callback_.callback(),
- observer_throttle_interval_);
+ if (scheduler_.is_null()) {
+ base::MessageLoop::current()->PostDelayedTask(
+ FROM_HERE,
+ update_target_list_callback_.callback(),
+ base::TimeDelta::FromMilliseconds(kObserverThrottleInterval));
+ } else {
+ scheduler_.Run(update_target_list_callback_.callback());
+ }
update_target_list_required_ = false;
if (!delegate_) {
@@ -113,14 +123,8 @@ void DevToolsManager::NotifyTargetListChanged(
STLDeleteContainerPointers(targets.begin(), targets.end());
}
-// static
-base::TimeDelta DevToolsManager::observer_throttle_interval_ =
- base::TimeDelta::FromMilliseconds(500);
-
-// static
-void DevToolsManager::SetObserverThrottleIntervalForTest(
- base::TimeDelta interval) {
- observer_throttle_interval_ = interval;
+void DevToolsManager::SetSchedulerForTest(Scheduler scheduler) {
+ scheduler_ = scheduler;
}
} // namespace content
« no previous file with comments | « content/browser/devtools/devtools_manager.h ('k') | content/browser/devtools/devtools_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698