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

Side by Side Diff: chromeos/network/auto_connect_handler_unittest.cc

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « chromeos/cert_loader_unittest.cc ('k') | chromeos/network/client_cert_resolver_unittest.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 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 "chromeos/network/auto_connect_handler.h" 5 #include "chromeos/network/auto_connect_handler.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 13 matching lines...) Expand all
24 #include "chromeos/network/client_cert_resolver.h" 24 #include "chromeos/network/client_cert_resolver.h"
25 #include "chromeos/network/managed_network_configuration_handler_impl.h" 25 #include "chromeos/network/managed_network_configuration_handler_impl.h"
26 #include "chromeos/network/network_configuration_handler.h" 26 #include "chromeos/network/network_configuration_handler.h"
27 #include "chromeos/network/network_profile_handler.h" 27 #include "chromeos/network/network_profile_handler.h"
28 #include "chromeos/network/network_state_handler.h" 28 #include "chromeos/network/network_state_handler.h"
29 #include "chromeos/network/onc/onc_utils.h" 29 #include "chromeos/network/onc/onc_utils.h"
30 #include "components/onc/onc_constants.h" 30 #include "components/onc/onc_constants.h"
31 #include "crypto/scoped_nss_types.h" 31 #include "crypto/scoped_nss_types.h"
32 #include "crypto/scoped_test_nss_db.h" 32 #include "crypto/scoped_test_nss_db.h"
33 #include "net/base/net_errors.h" 33 #include "net/base/net_errors.h"
34 #include "net/base/test_data_directory.h"
35 #include "net/cert/nss_cert_database_chromeos.h" 34 #include "net/cert/nss_cert_database_chromeos.h"
36 #include "net/cert/x509_certificate.h" 35 #include "net/cert/x509_certificate.h"
37 #include "net/test/cert_test_util.h" 36 #include "net/test/cert_test_util.h"
37 #include "net/test/test_data_directory.h"
38 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
39 #include "third_party/cros_system_api/dbus/service_constants.h" 39 #include "third_party/cros_system_api/dbus/service_constants.h"
40 40
41 namespace chromeos { 41 namespace chromeos {
42 42
43 namespace { 43 namespace {
44 44
45 const char* kUserHash = "user_hash"; 45 const char* kUserHash = "user_hash";
46 46
47 void ConfigureCallback(const dbus::ObjectPath& result) { 47 void ConfigureCallback(const dbus::ObjectPath& result) {
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 // Applying the user policy after login would usually trigger connecting to 503 // Applying the user policy after login would usually trigger connecting to
504 // the 'best' network. But the manual connect prevents this. 504 // the 'best' network. But the manual connect prevents this.
505 SetupPolicy(std::string(), // no network configs 505 SetupPolicy(std::string(), // no network configs
506 base::DictionaryValue(), // no global config 506 base::DictionaryValue(), // no global config
507 true); // load as user policy 507 true); // load as user policy
508 EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0")); 508 EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0"));
509 EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1")); 509 EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1"));
510 } 510 }
511 511
512 } // namespace chromeos 512 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/cert_loader_unittest.cc ('k') | chromeos/network/client_cert_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698