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

Side by Side Diff: chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/policy/device_status_collector.h" 5 #include "chrome/browser/chromeos/policy/device_status_collector.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1423 fake_network.connection_status != shill::kStateDisconnect; 1423 fake_network.connection_status != shill::kStateDisconnect;
1424 service_client->AddService( 1424 service_client->AddService(
1425 fake_network.name, /* service_path */ 1425 fake_network.name, /* service_path */
1426 fake_network.name /* guid */, 1426 fake_network.name /* guid */,
1427 fake_network.name /* name */, 1427 fake_network.name /* name */,
1428 fake_network.type /* type */, 1428 fake_network.type /* type */,
1429 fake_network.connection_status, 1429 fake_network.connection_status,
1430 is_visible); 1430 is_visible);
1431 service_client->SetServiceProperty( 1431 service_client->SetServiceProperty(
1432 fake_network.name, shill::kSignalStrengthProperty, 1432 fake_network.name, shill::kSignalStrengthProperty,
1433 base::FundamentalValue(fake_network.signal_strength)); 1433 base::Value(fake_network.signal_strength));
1434 service_client->SetServiceProperty( 1434 service_client->SetServiceProperty(
1435 fake_network.name, shill::kDeviceProperty, 1435 fake_network.name, shill::kDeviceProperty,
1436 base::StringValue(fake_network.device_path)); 1436 base::StringValue(fake_network.device_path));
1437 // Set the profile so this shows up as a configured network. 1437 // Set the profile so this shows up as a configured network.
1438 service_client->SetServiceProperty( 1438 service_client->SetServiceProperty(
1439 fake_network.name, shill::kProfileProperty, 1439 fake_network.name, shill::kProfileProperty,
1440 base::StringValue(fake_network.name)); 1440 base::StringValue(fake_network.name));
1441 if (strlen(fake_network.address) > 0) { 1441 if (strlen(fake_network.address) > 0) {
1442 // Set the IP config. 1442 // Set the IP config.
1443 base::DictionaryValue ip_config_properties; 1443 base::DictionaryValue ip_config_properties;
(...skipping 16 matching lines...) Expand all
1460 // reported list of networks because it doesn't have a profile specified. 1460 // reported list of networks because it doesn't have a profile specified.
1461 service_client->AddService( 1461 service_client->AddService(
1462 kUnconfiguredNetwork.name, /* service_path */ 1462 kUnconfiguredNetwork.name, /* service_path */
1463 kUnconfiguredNetwork.name /* guid */, 1463 kUnconfiguredNetwork.name /* guid */,
1464 kUnconfiguredNetwork.name /* name */, 1464 kUnconfiguredNetwork.name /* name */,
1465 kUnconfiguredNetwork.type /* type */, 1465 kUnconfiguredNetwork.type /* type */,
1466 kUnconfiguredNetwork.connection_status, 1466 kUnconfiguredNetwork.connection_status,
1467 true /* visible */); 1467 true /* visible */);
1468 service_client->SetServiceProperty( 1468 service_client->SetServiceProperty(
1469 kUnconfiguredNetwork.name, shill::kSignalStrengthProperty, 1469 kUnconfiguredNetwork.name, shill::kSignalStrengthProperty,
1470 base::FundamentalValue(kUnconfiguredNetwork.signal_strength)); 1470 base::Value(kUnconfiguredNetwork.signal_strength));
1471 service_client->SetServiceProperty( 1471 service_client->SetServiceProperty(
1472 kUnconfiguredNetwork.name, shill::kDeviceProperty, 1472 kUnconfiguredNetwork.name, shill::kDeviceProperty,
1473 base::StringValue(kUnconfiguredNetwork.device_path)); 1473 base::StringValue(kUnconfiguredNetwork.device_path));
1474 1474
1475 // Flush out pending state updates. 1475 // Flush out pending state updates.
1476 base::RunLoop().RunUntilIdle(); 1476 base::RunLoop().RunUntilIdle();
1477 1477
1478 chromeos::NetworkStateHandler::NetworkStateList state_list; 1478 chromeos::NetworkStateHandler::NetworkStateList state_list;
1479 chromeos::NetworkStateHandler* network_state_handler = 1479 chromeos::NetworkStateHandler* network_state_handler =
1480 chromeos::NetworkHandler::Get()->network_state_handler(); 1480 chromeos::NetworkHandler::Get()->network_state_handler();
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 AccountId::FromUserEmail(kPublicAccountId)); 1592 AccountId::FromUserEmail(kPublicAccountId));
1593 EXPECT_CALL(*user_manager_, IsLoggedInAsPublicAccount()) 1593 EXPECT_CALL(*user_manager_, IsLoggedInAsPublicAccount())
1594 .WillRepeatedly(Return(true)); 1594 .WillRepeatedly(Return(true));
1595 1595
1596 settings_helper_.SetBoolean(chromeos::kReportDeviceNetworkInterfaces, true); 1596 settings_helper_.SetBoolean(chromeos::kReportDeviceNetworkInterfaces, true);
1597 GetStatus(); 1597 GetStatus();
1598 VerifyNetworkReporting(); 1598 VerifyNetworkReporting();
1599 } 1599 }
1600 1600
1601 } // namespace policy 1601 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698