| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "chrome/browser/devtools/device/devtools_android_bridge.h" | 9 #include "chrome/browser/devtools/device/devtools_android_bridge.h" |
| 10 #include "chrome/browser/devtools/device/self_device_provider.h" | 10 #include "chrome/browser/devtools/device/self_device_provider.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 void set_skip_empty_devices(bool skip_empty_devices) { | 65 void set_skip_empty_devices(bool skip_empty_devices) { |
| 66 skip_empty_devices_ = skip_empty_devices; | 66 skip_empty_devices_ = skip_empty_devices; |
| 67 } | 67 } |
| 68 | 68 |
| 69 private: | 69 private: |
| 70 Profile* profile_; | 70 Profile* profile_; |
| 71 bool skip_empty_devices_; | 71 bool skip_empty_devices_; |
| 72 }; | 72 }; |
| 73 }; | 73 }; |
| 74 | 74 |
| 75 // Flaky on all platforms. https://crbug.com/477696 |
| 75 IN_PROC_BROWSER_TEST_F(PortForwardingTest, | 76 IN_PROC_BROWSER_TEST_F(PortForwardingTest, |
| 76 LoadPageWithStyleAnsScript) { | 77 DISABLED_LoadPageWithStyleAnsScript) { |
| 77 Profile* profile = browser()->profile(); | 78 Profile* profile = browser()->profile(); |
| 78 | 79 |
| 79 AndroidDeviceManager::DeviceProviders device_providers; | 80 AndroidDeviceManager::DeviceProviders device_providers; |
| 80 device_providers.push_back(new SelfAsDeviceProvider(kDefaultDebuggingPort)); | 81 device_providers.push_back(new SelfAsDeviceProvider(kDefaultDebuggingPort)); |
| 81 DevToolsAndroidBridge::Factory::GetForProfile(profile)-> | 82 DevToolsAndroidBridge::Factory::GetForProfile(profile)-> |
| 82 set_device_providers_for_test(device_providers); | 83 set_device_providers_for_test(device_providers); |
| 83 | 84 |
| 84 ASSERT_TRUE(test_server()->Start()); | 85 ASSERT_TRUE(test_server()->Start()); |
| 85 GURL original_url = test_server()->GetURL(kPortForwardingTestPage); | 86 GURL original_url = test_server()->GetURL(kPortForwardingTestPage); |
| 86 | 87 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 content::RunMessageLoop(); | 172 content::RunMessageLoop(); |
| 172 | 173 |
| 173 self_provider->set_release_callback_for_test( | 174 self_provider->set_release_callback_for_test( |
| 174 base::Bind(&base::MessageLoop::PostTask, | 175 base::Bind(&base::MessageLoop::PostTask, |
| 175 base::Unretained(base::MessageLoop::current()), | 176 base::Unretained(base::MessageLoop::current()), |
| 176 FROM_HERE, | 177 FROM_HERE, |
| 177 base::MessageLoop::QuitClosure())); | 178 base::MessageLoop::QuitClosure())); |
| 178 wait_for_port_forwarding.reset(); | 179 wait_for_port_forwarding.reset(); |
| 179 content::RunMessageLoop(); | 180 content::RunMessageLoop(); |
| 180 } | 181 } |
| OLD | NEW |