chrome/browser/chromeos/cros/onc_network_parser_unittest.cc - Issue 11299236: This moves the ONC parsing code into chromeos/network/onc

Unified Diff: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove translated strings Created 8 years 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/cros/network_library_impl_base.cc ('K') | « chrome/browser/chromeos/cros/onc_network_parser.cc ('k') | chrome/browser/chromeos/network_settings/onc_certificate_importer.h » ('j') | chrome/browser/policy/network_configuration_updater.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

diff --git a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

index 2f61b4b45880eac125815fd4a5eac6e9b39797b1..1d3d3f618c21d3eca2d9c39e441d6099154d71bd 100644

--- a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

+++ b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

@@ -20,15 +20,15 @@

#include "chrome/browser/chromeos/cros/certificate_pattern.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/network_library.h"

-#include "chrome/browser/chromeos/cros/onc_constants.h"

#include "chrome/browser/chromeos/login/mock_user_manager.h"

-#include "chrome/browser/chromeos/network_settings/onc_utils.h"

#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/net/x509_certificate_model.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_pref_service.h"

#include "chromeos/dbus/dbus_thread_manager.h"

+#include "chromeos/network/onc/onc_constants.h"

+#include "chromeos/network/onc/onc_utils.h"

#include "content/public/test/test_browser_thread.h"

#include "crypto/nss_util.h"

#include "net/base/cert_type.h"

@@ -191,7 +191,7 @@ void OncNetworkParserTest::TestProxySettings(const std::string filename,

// Parse Network Configuration including ProxySettings dictionary.

scoped_ptr<base::ListValue> network_configs = ReadNetworkConfigs(filename);

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

ASSERT_TRUE(network.get());

@@ -213,7 +213,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifi) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-wifi.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -234,7 +234,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkEthernet) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-ethernet.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

EXPECT_GE(parser.GetNetworkConfigsSize(), 1);

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -249,7 +249,7 @@ TEST_F(OncNetworkParserTest, TestLoadWifiCertificatePattern) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("cert-pattern.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

ASSERT_TRUE(parser.parse_error().empty());

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -277,7 +277,7 @@ TEST_F(OncNetworkParserTest, TestLoadVPNCertificatePattern) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("cert-pattern-vpn.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

ASSERT_TRUE(parser.parse_error().empty());

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -301,7 +301,7 @@ TEST_F(OncNetworkParserTest, TestNoCertificatePatternForDevicePolicy) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("cert-pattern.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_DEVICE_POLICY);

+ onc::ONC_SOURCE_DEVICE_POLICY);

// Make sure we fail when parsing a certificate pattern from a device policy

// ONC file.

@@ -326,7 +326,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP1) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-wifi-eap1.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -349,7 +349,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP2) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-wifi-eap2.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -374,7 +374,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkUnknownFields) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-unknown-fields.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

ASSERT_TRUE(network.get());

@@ -389,7 +389,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-openvpn.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -447,7 +447,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkL2TPIPsec) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-l2tp-ipsec.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));

@@ -548,7 +548,7 @@ TEST(OncNetworkParserUserExpansionTest, GetUserExpandedValue) {

.Times(2)

.WillRepeatedly(Return(false));

- NetworkUIData::ONCSource source = NetworkUIData::ONC_SOURCE_USER_IMPORT;

+ onc::ONCSource source = onc::ONC_SOURCE_USER_IMPORT;

// Setup environment needed by UserManager.

MessageLoop loop;

@@ -585,7 +585,7 @@ TEST_F(OncNetworkParserTest, TestRemoveNetworkWifi) {

scoped_ptr<base::ListValue> network_configs =

ReadNetworkConfigs("network-wifi-remove.onc");

OncNetworkParser parser(*network_configs,

- NetworkUIData::ONC_SOURCE_USER_IMPORT);

+ onc::ONC_SOURCE_USER_IMPORT);

EXPECT_EQ(1, parser.GetNetworkConfigsSize());

bool marked_for_removal = false;

scoped_ptr<Network> network(parser.ParseNetwork(0, &marked_for_removal));