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

Side by Side Diff: chromeos/dbus/shill_device_client_unittest.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/values.h" 6 #include "base/values.h"
7 #include "chromeos/dbus/shill_client_unittest_base.h" 7 #include "chromeos/dbus/shill_client_unittest_base.h"
8 #include "chromeos/dbus/shill_device_client.h" 8 #include "chromeos/dbus/shill_device_client.h"
9 #include "dbus/message.h" 9 #include "dbus/message.h"
10 #include "dbus/object_path.h" 10 #include "dbus/object_path.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 public: 53 public:
54 ShillDeviceClientTest() 54 ShillDeviceClientTest()
55 : ShillClientUnittestBase(flimflam::kFlimflamDeviceInterface, 55 : ShillClientUnittestBase(flimflam::kFlimflamDeviceInterface,
56 dbus::ObjectPath(kExampleDevicePath)) { 56 dbus::ObjectPath(kExampleDevicePath)) {
57 } 57 }
58 58
59 virtual void SetUp() { 59 virtual void SetUp() {
60 ShillClientUnittestBase::SetUp(); 60 ShillClientUnittestBase::SetUp();
61 // Create a client with the mock bus. 61 // Create a client with the mock bus.
62 client_.reset(ShillDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION, 62 client_.reset(ShillDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
63 mock_bus_)); 63 mock_bus_.get()));
64 // Run the message loop to run the signal connection result callback. 64 // Run the message loop to run the signal connection result callback.
65 message_loop_.RunUntilIdle(); 65 message_loop_.RunUntilIdle();
66 } 66 }
67 67
68 virtual void TearDown() { 68 virtual void TearDown() {
69 ShillClientUnittestBase::TearDown(); 69 ShillClientUnittestBase::TearDown();
70 } 70 }
71 71
72 protected: 72 protected:
73 scoped_ptr<ShillDeviceClient> client_; 73 scoped_ptr<ShillDeviceClient> client_;
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 EXPECT_CALL(mock_closure, Run()).Times(1); 405 EXPECT_CALL(mock_closure, Run()).Times(1);
406 // Call method. 406 // Call method.
407 client_->Reset(dbus::ObjectPath(kExampleDevicePath), 407 client_->Reset(dbus::ObjectPath(kExampleDevicePath),
408 mock_closure.GetCallback(), 408 mock_closure.GetCallback(),
409 mock_error_callback.GetCallback()); 409 mock_error_callback.GetCallback());
410 // Run the message loop. 410 // Run the message loop.
411 message_loop_.RunUntilIdle(); 411 message_loop_.RunUntilIdle();
412 } 412 }
413 413
414 } // namespace chromeos 414 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/shill_client_unittest_base.cc ('k') | chromeos/dbus/shill_ipconfig_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698