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

Side by Side Diff: chromeos/dbus/shill_manager_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_manager_client.h" 8 #include "chromeos/dbus/shill_manager_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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ShillManagerClientTest() 132 ShillManagerClientTest()
133 : ShillClientUnittestBase( 133 : ShillClientUnittestBase(
134 flimflam::kFlimflamManagerInterface, 134 flimflam::kFlimflamManagerInterface,
135 dbus::ObjectPath(flimflam::kFlimflamServicePath)) { 135 dbus::ObjectPath(flimflam::kFlimflamServicePath)) {
136 } 136 }
137 137
138 virtual void SetUp() { 138 virtual void SetUp() {
139 ShillClientUnittestBase::SetUp(); 139 ShillClientUnittestBase::SetUp();
140 // Create a client with the mock bus. 140 // Create a client with the mock bus.
141 client_.reset(ShillManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION, 141 client_.reset(ShillManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
142 mock_bus_)); 142 mock_bus_.get()));
143 // Run the message loop to run the signal connection result callback. 143 // Run the message loop to run the signal connection result callback.
144 message_loop_.RunUntilIdle(); 144 message_loop_.RunUntilIdle();
145 } 145 }
146 146
147 virtual void TearDown() { 147 virtual void TearDown() {
148 ShillClientUnittestBase::TearDown(); 148 ShillClientUnittestBase::TearDown();
149 } 149 }
150 150
151 protected: 151 protected:
152 scoped_ptr<ShillManagerClient> client_; 152 scoped_ptr<ShillManagerClient> client_;
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 arguments[7], 538 arguments[7],
539 base::Bind(&ExpectStringResultWithoutStatus, expected), 539 base::Bind(&ExpectStringResultWithoutStatus, expected),
540 mock_error_callback.GetCallback()); 540 mock_error_callback.GetCallback());
541 EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0); 541 EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
542 542
543 // Run the message loop. 543 // Run the message loop.
544 message_loop_.RunUntilIdle(); 544 message_loop_.RunUntilIdle();
545 } 545 }
546 546
547 } // namespace chromeos 547 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/shill_ipconfig_client_unittest.cc ('k') | chromeos/dbus/shill_profile_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698