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

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

Issue 708563005: Use setProperties for IP Config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430113_internet_options_1
Patch Set: Fix win/mac test expectations Created 5 years, 11 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 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 <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 dbus_manager->GetShillProfileClient()->GetTestInterface()->AddProfile( 108 dbus_manager->GetShillProfileClient()->GetTestInterface()->AddProfile(
109 "shared_profile_path", std::string() /* shared profile */); 109 "shared_profile_path", std::string() /* shared profile */);
110 dbus_manager->GetShillProfileClient()->GetTestInterface()->AddProfile( 110 dbus_manager->GetShillProfileClient()->GetTestInterface()->AddProfile(
111 "user_profile_path", kUserHash); 111 "user_profile_path", kUserHash);
112 112
113 base::RunLoop().RunUntilIdle(); 113 base::RunLoop().RunUntilIdle();
114 LoginState::Initialize(); 114 LoginState::Initialize();
115 network_state_handler_.reset(NetworkStateHandler::InitializeForTest()); 115 network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
116 network_config_handler_.reset( 116 network_config_handler_.reset(
117 NetworkConfigurationHandler::InitializeForTest( 117 NetworkConfigurationHandler::InitializeForTest(
118 network_state_handler_.get())); 118 network_state_handler_.get(), NULL /* network_device_handler */));
119 119
120 network_profile_handler_.reset(new NetworkProfileHandler()); 120 network_profile_handler_.reset(new NetworkProfileHandler());
121 network_profile_handler_->Init(); 121 network_profile_handler_->Init();
122 122
123 managed_config_handler_.reset(new ManagedNetworkConfigurationHandlerImpl()); 123 managed_config_handler_.reset(new ManagedNetworkConfigurationHandlerImpl());
124 managed_config_handler_->Init( 124 managed_config_handler_->Init(
125 network_state_handler_.get(), network_profile_handler_.get(), 125 network_state_handler_.get(), network_profile_handler_.get(),
126 network_config_handler_.get(), nullptr /* network_device_handler */); 126 network_config_handler_.get(), nullptr /* network_device_handler */);
127 127
128 client_cert_resolver_.reset(new ClientCertResolver()); 128 client_cert_resolver_.reset(new ClientCertResolver());
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 SetupPolicy(std::string(), // no network configs 466 SetupPolicy(std::string(), // no network configs
467 base::DictionaryValue(), // no global config 467 base::DictionaryValue(), // no global config
468 true); // load as user policy 468 true); // load as user policy
469 EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0")); 469 EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0"));
470 EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1")); 470 EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1"));
471 } 471 }
472 472
473 } // namespace chromeos 473 } // namespace chromeos
474 474
475 #endif 475 #endif
OLDNEW
« no previous file with comments | « chromeos/dbus/fake_shill_manager_client.cc ('k') | chromeos/network/client_cert_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698