| 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 <map> | 5 #include <map> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 result->AppendString(::onc::network_config::kEthernet); | 145 result->AppendString(::onc::network_config::kEthernet); |
| 146 } | 146 } |
| 147 return result.Pass(); | 147 return result.Pass(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 scoped_ptr<DeviceStateList> GetDeviceStateList() override { | 150 scoped_ptr<DeviceStateList> GetDeviceStateList() override { |
| 151 scoped_ptr<DeviceStateList> result; | 151 scoped_ptr<DeviceStateList> result; |
| 152 if (fail_) | 152 if (fail_) |
| 153 return result.Pass(); | 153 return result.Pass(); |
| 154 result.reset(new DeviceStateList); | 154 result.reset(new DeviceStateList); |
| 155 scoped_ptr<core_api::networking_private::DeviceStateProperties> properties( | 155 scoped_ptr<api::networking_private::DeviceStateProperties> properties( |
| 156 new core_api::networking_private::DeviceStateProperties); | 156 new api::networking_private::DeviceStateProperties); |
| 157 properties->type = core_api::networking_private::NETWORK_TYPE_ETHERNET; | 157 properties->type = api::networking_private::NETWORK_TYPE_ETHERNET; |
| 158 properties->state = core_api::networking_private::DEVICE_STATE_TYPE_ENABLED; | 158 properties->state = api::networking_private::DEVICE_STATE_TYPE_ENABLED; |
| 159 result->push_back(properties.Pass()); | 159 result->push_back(properties.Pass()); |
| 160 return result.Pass(); | 160 return result.Pass(); |
| 161 } | 161 } |
| 162 | 162 |
| 163 bool EnableNetworkType(const std::string& type) override { | 163 bool EnableNetworkType(const std::string& type) override { |
| 164 enabled_[type] = true; | 164 enabled_[type] = true; |
| 165 return !fail_; | 165 return !fail_; |
| 166 } | 166 } |
| 167 | 167 |
| 168 bool DisableNetworkType(const std::string& type) override { | 168 bool DisableNetworkType(const std::string& type) override { |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; | 519 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; |
| 520 } | 520 } |
| 521 | 521 |
| 522 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { | 522 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { |
| 523 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; | 523 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; |
| 524 } | 524 } |
| 525 | 525 |
| 526 #endif // defined(OS_WIN) | 526 #endif // defined(OS_WIN) |
| 527 | 527 |
| 528 } // namespace extensions | 528 } // namespace extensions |
| OLD | NEW |