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

Side by Side 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, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/devtools/devtools_manager.h" 5 #include "content/browser/devtools/devtools_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/browser/devtools/devtools_agent_host_impl.h" 9 #include "content/browser/devtools/devtools_agent_host_impl.h"
10 #include "content/browser/devtools/devtools_netlog_observer.h" 10 #include "content/browser/devtools/devtools_netlog_observer.h"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 #include "content/public/browser/content_browser_client.h" 12 #include "content/public/browser/content_browser_client.h"
13 #include "content/public/browser/devtools_target.h" 13 #include "content/public/browser/devtools_target.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 namespace {
18
19 int kObserverThrottleInterval = 500; // ms
20
21 } // namespace
22
17 // static 23 // static
18 DevToolsManager* DevToolsManager::GetInstance() { 24 DevToolsManager* DevToolsManager::GetInstance() {
19 return Singleton<DevToolsManager>::get(); 25 return Singleton<DevToolsManager>::get();
20 } 26 }
21 27
22 DevToolsManager::DevToolsManager() 28 DevToolsManager::DevToolsManager()
23 : delegate_(GetContentClient()->browser()->GetDevToolsManagerDelegate()), 29 : delegate_(GetContentClient()->browser()->GetDevToolsManagerDelegate()),
24 update_target_list_required_(false), 30 update_target_list_required_(false),
25 update_target_list_scheduled_(false), 31 update_target_list_scheduled_(false),
26 update_target_list_callback_(base::Bind( 32 update_target_list_callback_(base::Bind(
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 UpdateTargetListThrottled(); 90 UpdateTargetListThrottled();
85 } 91 }
86 92
87 void DevToolsManager::UpdateTargetListThrottled() { 93 void DevToolsManager::UpdateTargetListThrottled() {
88 if (!update_target_list_required_) { 94 if (!update_target_list_required_) {
89 update_target_list_scheduled_ = false; 95 update_target_list_scheduled_ = false;
90 return; 96 return;
91 } 97 }
92 98
93 update_target_list_scheduled_ = true; 99 update_target_list_scheduled_ = true;
94 base::MessageLoop::current()->PostDelayedTask( 100 if (scheduler_.is_null()) {
95 FROM_HERE, 101 base::MessageLoop::current()->PostDelayedTask(
96 update_target_list_callback_.callback(), 102 FROM_HERE,
97 observer_throttle_interval_); 103 update_target_list_callback_.callback(),
104 base::TimeDelta::FromMilliseconds(kObserverThrottleInterval));
105 } else {
106 scheduler_.Run(update_target_list_callback_.callback());
107 }
98 108
99 update_target_list_required_ = false; 109 update_target_list_required_ = false;
100 if (!delegate_) { 110 if (!delegate_) {
101 Observer::TargetList empty_list; 111 Observer::TargetList empty_list;
102 NotifyTargetListChanged(empty_list); 112 NotifyTargetListChanged(empty_list);
103 return; 113 return;
104 } 114 }
105 delegate_->EnumerateTargets(base::Bind( 115 delegate_->EnumerateTargets(base::Bind(
106 &DevToolsManager::NotifyTargetListChanged, 116 &DevToolsManager::NotifyTargetListChanged,
107 base::Unretained(this))); 117 base::Unretained(this)));
108 } 118 }
109 119
110 void DevToolsManager::NotifyTargetListChanged( 120 void DevToolsManager::NotifyTargetListChanged(
111 const Observer::TargetList& targets) { 121 const Observer::TargetList& targets) {
112 FOR_EACH_OBSERVER(Observer, observer_list_, TargetListChanged(targets)); 122 FOR_EACH_OBSERVER(Observer, observer_list_, TargetListChanged(targets));
113 STLDeleteContainerPointers(targets.begin(), targets.end()); 123 STLDeleteContainerPointers(targets.begin(), targets.end());
114 } 124 }
115 125
116 // static 126 void DevToolsManager::SetSchedulerForTest(Scheduler scheduler) {
117 base::TimeDelta DevToolsManager::observer_throttle_interval_ = 127 scheduler_ = scheduler;
118 base::TimeDelta::FromMilliseconds(500);
119
120 // static
121 void DevToolsManager::SetObserverThrottleIntervalForTest(
122 base::TimeDelta interval) {
123 observer_throttle_interval_ = interval;
124 } 128 }
125 129
126 } // namespace content 130 } // namespace content
OLDNEW
« 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