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

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

Issue 15774005: chromeos: Use base::MessageLoop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
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 "chromeos/network/shill_property_handler.h" 5 #include "chromeos/network/shill_property_handler.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 AddService(flimflam::kTypeEthernet, "stub_ethernet", 229 AddService(flimflam::kTypeEthernet, "stub_ethernet",
230 flimflam::kStateOnline, add_to_watchlist); 230 flimflam::kStateOnline, add_to_watchlist);
231 AddService(flimflam::kTypeWifi, "stub_wifi1", 231 AddService(flimflam::kTypeWifi, "stub_wifi1",
232 flimflam::kStateOnline, add_to_watchlist); 232 flimflam::kStateOnline, add_to_watchlist);
233 AddService(flimflam::kTypeWifi, "stub_wifi2", 233 AddService(flimflam::kTypeWifi, "stub_wifi2",
234 flimflam::kStateIdle, add_to_watchlist); 234 flimflam::kStateIdle, add_to_watchlist);
235 AddService(flimflam::kTypeCellular, "stub_cellular1", 235 AddService(flimflam::kTypeCellular, "stub_cellular1",
236 flimflam::kStateIdle, add_to_watchlist); 236 flimflam::kStateIdle, add_to_watchlist);
237 } 237 }
238 238
239 MessageLoopForUI message_loop_; 239 base::MessageLoopForUI message_loop_;
240 scoped_ptr<TestListener> listener_; 240 scoped_ptr<TestListener> listener_;
241 scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_; 241 scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
242 ShillManagerClient::TestInterface* manager_test_; 242 ShillManagerClient::TestInterface* manager_test_;
243 ShillDeviceClient::TestInterface* device_test_; 243 ShillDeviceClient::TestInterface* device_test_;
244 ShillServiceClient::TestInterface* service_test_; 244 ShillServiceClient::TestInterface* service_test_;
245 245
246 private: 246 private:
247 DISALLOW_COPY_AND_ASSIGN(ShillPropertyHandlerTest); 247 DISALLOW_COPY_AND_ASSIGN(ShillPropertyHandlerTest);
248 }; 248 };
249 249
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2, 418 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2,
419 flimflam::kStateIdle, kTestIPConfigPath, true); 419 flimflam::kStateIdle, kTestIPConfigPath, true);
420 message_loop_.RunUntilIdle(); 420 message_loop_.RunUntilIdle();
421 // A watched service with the IPConfig property already set must 421 // A watched service with the IPConfig property already set must
422 // trigger property updates for IP Address and DNS when added. 422 // trigger property updates for IP Address and DNS when added.
423 EXPECT_EQ(3, listener_-> 423 EXPECT_EQ(3, listener_->
424 property_updates(flimflam::kServicesProperty)[kTestServicePath2]); 424 property_updates(flimflam::kServicesProperty)[kTestServicePath2]);
425 } 425 }
426 426
427 } // namespace chromeos 427 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_state_handler_unittest.cc ('k') | chromeos/power/power_manager_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698