| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 85 |
| 86 device_providers.push_back( | 86 device_providers.push_back( |
| 87 TCPDeviceProvider::CreateForLocalhost(kDefaultDebuggingPort)); | 87 TCPDeviceProvider::CreateForLocalhost(kDefaultDebuggingPort)); |
| 88 DevToolsAndroidBridge::Factory::GetForProfile(profile)-> | 88 DevToolsAndroidBridge::Factory::GetForProfile(profile)-> |
| 89 set_device_providers_for_test(device_providers); | 89 set_device_providers_for_test(device_providers); |
| 90 | 90 |
| 91 ASSERT_TRUE(embedded_test_server()->Start()); | 91 ASSERT_TRUE(embedded_test_server()->Start()); |
| 92 GURL original_url = embedded_test_server()->GetURL(kPortForwardingTestPage); | 92 GURL original_url = embedded_test_server()->GetURL(kPortForwardingTestPage); |
| 93 | 93 |
| 94 std::string forwarding_port("8000"); | 94 std::string forwarding_port("8000"); |
| 95 GURL forwarding_url(original_url.scheme() + "://" + | 95 GURL forwarding_url(original_url.scheme() + "://" + original_url.host() + |
| 96 original_url.host() + ":" + forwarding_port + original_url.path()); | 96 ":" + forwarding_port + original_url.path().as_string()); |
| 97 | 97 |
| 98 PrefService* prefs = profile->GetPrefs(); | 98 PrefService* prefs = profile->GetPrefs(); |
| 99 prefs->SetBoolean(prefs::kDevToolsPortForwardingEnabled, true); | 99 prefs->SetBoolean(prefs::kDevToolsPortForwardingEnabled, true); |
| 100 | 100 |
| 101 base::DictionaryValue config; | 101 base::DictionaryValue config; |
| 102 config.SetString( | 102 config.SetString( |
| 103 forwarding_port, original_url.host() + ":" + original_url.port()); | 103 forwarding_port, original_url.host() + ":" + original_url.port()); |
| 104 prefs->Set(prefs::kDevToolsPortForwardingConfig, config); | 104 prefs->Set(prefs::kDevToolsPortForwardingConfig, config); |
| 105 | 105 |
| 106 Listener wait_for_port_forwarding(profile); | 106 Listener wait_for_port_forwarding(profile); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 TCPDeviceProvider::CreateForLocalhost(kAlternativeDebuggingPort)); | 156 TCPDeviceProvider::CreateForLocalhost(kAlternativeDebuggingPort)); |
| 157 device_providers.push_back(self_provider); | 157 device_providers.push_back(self_provider); |
| 158 | 158 |
| 159 DevToolsAndroidBridge::Factory::GetForProfile(profile)-> | 159 DevToolsAndroidBridge::Factory::GetForProfile(profile)-> |
| 160 set_device_providers_for_test(device_providers); | 160 set_device_providers_for_test(device_providers); |
| 161 | 161 |
| 162 ASSERT_TRUE(embedded_test_server()->Start()); | 162 ASSERT_TRUE(embedded_test_server()->Start()); |
| 163 GURL original_url = embedded_test_server()->GetURL(kPortForwardingTestPage); | 163 GURL original_url = embedded_test_server()->GetURL(kPortForwardingTestPage); |
| 164 | 164 |
| 165 std::string forwarding_port("8000"); | 165 std::string forwarding_port("8000"); |
| 166 GURL forwarding_url(original_url.scheme() + "://" + | 166 GURL forwarding_url(original_url.scheme() + "://" + original_url.host() + |
| 167 original_url.host() + ":" + forwarding_port + original_url.path()); | 167 ":" + forwarding_port + original_url.path().as_string()); |
| 168 | 168 |
| 169 PrefService* prefs = profile->GetPrefs(); | 169 PrefService* prefs = profile->GetPrefs(); |
| 170 prefs->SetBoolean(prefs::kDevToolsPortForwardingEnabled, true); | 170 prefs->SetBoolean(prefs::kDevToolsPortForwardingEnabled, true); |
| 171 | 171 |
| 172 base::DictionaryValue config; | 172 base::DictionaryValue config; |
| 173 config.SetString( | 173 config.SetString( |
| 174 forwarding_port, original_url.host() + ":" + original_url.port()); | 174 forwarding_port, original_url.host() + ":" + original_url.port()); |
| 175 prefs->Set(prefs::kDevToolsPortForwardingConfig, config); | 175 prefs->Set(prefs::kDevToolsPortForwardingConfig, config); |
| 176 | 176 |
| 177 std::unique_ptr<Listener> wait_for_port_forwarding(new Listener(profile)); | 177 std::unique_ptr<Listener> wait_for_port_forwarding(new Listener(profile)); |
| 178 content::RunMessageLoop(); | 178 content::RunMessageLoop(); |
| 179 | 179 |
| 180 base::RunLoop run_loop; | 180 base::RunLoop run_loop; |
| 181 | 181 |
| 182 self_provider->set_release_callback_for_test( | 182 self_provider->set_release_callback_for_test( |
| 183 base::Bind(base::IgnoreResult(&base::SingleThreadTaskRunner::PostTask), | 183 base::Bind(base::IgnoreResult(&base::SingleThreadTaskRunner::PostTask), |
| 184 base::ThreadTaskRunnerHandle::Get(), FROM_HERE, | 184 base::ThreadTaskRunnerHandle::Get(), FROM_HERE, |
| 185 run_loop.QuitWhenIdleClosure())); | 185 run_loop.QuitWhenIdleClosure())); |
| 186 wait_for_port_forwarding.reset(); | 186 wait_for_port_forwarding.reset(); |
| 187 | 187 |
| 188 content::RunThisRunLoop(&run_loop); | 188 content::RunThisRunLoop(&run_loop); |
| 189 } | 189 } |
| OLD | NEW |