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

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 285233008: Add MacAddress to ONC and networkingPrivate (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase Created 6 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/callback.h" 6 #include "base/callback.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chromeos/login/users/user.h" 10 #include "chrome/browser/chromeos/login/users/user.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 service_test_->ClearServices(); 237 service_test_->ClearServices();
238 238
239 // Sends a notification about the added profile. 239 // Sends a notification about the added profile.
240 profile_test->AddProfile(kUser1ProfilePath, userhash_); 240 profile_test->AddProfile(kUser1ProfilePath, userhash_);
241 241
242 // Add IPConfigs 242 // Add IPConfigs
243 base::DictionaryValue ipconfig; 243 base::DictionaryValue ipconfig;
244 ipconfig.SetStringWithoutPathExpansion(shill::kAddressProperty, "0.0.0.0"); 244 ipconfig.SetStringWithoutPathExpansion(shill::kAddressProperty, "0.0.0.0");
245 ipconfig.SetStringWithoutPathExpansion(shill::kGatewayProperty, "0.0.0.1"); 245 ipconfig.SetStringWithoutPathExpansion(shill::kGatewayProperty, "0.0.0.1");
246 ipconfig.SetIntegerWithoutPathExpansion(shill::kPrefixlenProperty, 0); 246 ipconfig.SetIntegerWithoutPathExpansion(shill::kPrefixlenProperty, 0);
247 ipconfig.SetStringWithoutPathExpansion( 247 ipconfig.SetStringWithoutPathExpansion(shill::kMethodProperty,
248 shill::kMethodProperty, shill::kTypeIPv4); 248 shill::kTypeIPv4);
249 ip_config_test->AddIPConfig(kIPConfigPath, ipconfig); 249 ip_config_test->AddIPConfig(kIPConfigPath, ipconfig);
250 250
251 // Add Devices 251 // Add Devices
252 device_test->AddDevice( 252 device_test->AddDevice(
253 kWifiDevicePath, shill::kTypeWifi, "stub_wifi_device1"); 253 kWifiDevicePath, shill::kTypeWifi, "stub_wifi_device1");
254 base::ListValue wifi_ip_configs; 254 base::ListValue wifi_ip_configs;
255 wifi_ip_configs.AppendString(kIPConfigPath); 255 wifi_ip_configs.AppendString(kIPConfigPath);
256 device_test->SetDeviceProperty( 256 device_test->SetDeviceProperty(
257 kWifiDevicePath, shill::kIPConfigsProperty, wifi_ip_configs); 257 kWifiDevicePath, shill::kIPConfigsProperty, wifi_ip_configs);
258 device_test->SetDeviceProperty(kWifiDevicePath,
259 shill::kAddressProperty,
260 base::StringValue("001122aabbcc"));
258 device_test->AddDevice( 261 device_test->AddDevice(
259 kCellularDevicePath, shill::kTypeCellular, "stub_cellular_device1"); 262 kCellularDevicePath, shill::kTypeCellular, "stub_cellular_device1");
260 263
261 // Add Services 264 // Add Services
262 AddService("stub_ethernet", "eth0", 265 AddService("stub_ethernet", "eth0",
263 shill::kTypeEthernet, shill::kStateOnline); 266 shill::kTypeEthernet, shill::kStateOnline);
264 service_test_->SetServiceProperty( 267 service_test_->SetServiceProperty(
265 "stub_ethernet", 268 "stub_ethernet",
266 shill::kProfileProperty, 269 shill::kProfileProperty,
267 base::StringValue(ShillProfileClient::GetSharedProfilePath())); 270 base::StringValue(ShillProfileClient::GetSharedProfilePath()));
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 base::Unretained(detector()))); 601 base::Unretained(detector())));
599 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; 602 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_;
600 } 603 }
601 #endif // defined(OS_CHROMEOS) 604 #endif // defined(OS_CHROMEOS)
602 605
603 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, 606 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
604 ExtensionNetworkingPrivateApiTest, 607 ExtensionNetworkingPrivateApiTest,
605 testing::Bool()); 608 testing::Bool());
606 609
607 } // namespace 610 } // namespace
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698