summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_debugger.gypi
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-08-10 10:18:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-10 17:19:23 +0000
commit543bb913c76e73e6548991f48886e8d60633fbdd (patch)
tree9323e78e844124d283bce7aa156b8a4728f4b60b /chrome/chrome_debugger.gypi
parent5a689d2d05ce686cbe9d8ef38c379836771f0c8f (diff)
downloadchromium_src-543bb913c76e73e6548991f48886e8d60633fbdd.zip
chromium_src-543bb913c76e73e6548991f48886e8d60633fbdd.tar.gz
chromium_src-543bb913c76e73e6548991f48886e8d60633fbdd.tar.bz2
Fix startup race in initializing DevToolsNetworkController.
DevToolsNetworkController is accessible from the UI half of the Profile, which means that it must be created on the UI thread. It, however, is currently created on the IO, so this doesn't work. Instead, split into the single-threaded controller (no need for a Helper class in unit tests) and a handle which does the cross-thread management. On the UI thread, only DevToolsNetworkControllerHandle may be used. On the IO thread, a Handle may be exchanged for the underlying controller. BUG=515492 Review URL: https://codereview.chromium.org/1279603002 Cr-Commit-Position: refs/heads/master@{#342639}
Diffstat (limited to 'chrome/chrome_debugger.gypi')
-rw-r--r--chrome/chrome_debugger.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_debugger.gypi b/chrome/chrome_debugger.gypi
index 7beba91..48e1ea3 100644
--- a/chrome/chrome_debugger.gypi
+++ b/chrome/chrome_debugger.gypi
@@ -29,6 +29,8 @@
'browser/devtools/devtools_network_conditions.h',
'browser/devtools/devtools_network_controller.cc',
'browser/devtools/devtools_network_controller.h',
+ 'browser/devtools/devtools_network_controller_handle.cc',
+ 'browser/devtools/devtools_network_controller_handle.h',
'browser/devtools/devtools_network_interceptor.cc',
'browser/devtools/devtools_network_interceptor.h',
'browser/devtools/devtools_network_protocol_handler.cc',