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

Side by Side Diff: chromeos/dbus/shill_service_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_service_client.h" 8 #include "chromeos/dbus/shill_service_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 16 matching lines...) Expand all
27 public: 27 public:
28 ShillServiceClientTest() 28 ShillServiceClientTest()
29 : ShillClientUnittestBase(flimflam::kFlimflamServiceInterface, 29 : ShillClientUnittestBase(flimflam::kFlimflamServiceInterface,
30 dbus::ObjectPath(kExampleServicePath)) { 30 dbus::ObjectPath(kExampleServicePath)) {
31 } 31 }
32 32
33 virtual void SetUp() { 33 virtual void SetUp() {
34 ShillClientUnittestBase::SetUp(); 34 ShillClientUnittestBase::SetUp();
35 // Create a client with the mock bus. 35 // Create a client with the mock bus.
36 client_.reset(ShillServiceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION, 36 client_.reset(ShillServiceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
37 mock_bus_)); 37 mock_bus_.get()));
38 // Run the message loop to run the signal connection result callback. 38 // Run the message loop to run the signal connection result callback.
39 message_loop_.RunUntilIdle(); 39 message_loop_.RunUntilIdle();
40 } 40 }
41 41
42 virtual void TearDown() { 42 virtual void TearDown() {
43 ShillClientUnittestBase::TearDown(); 43 ShillClientUnittestBase::TearDown();
44 } 44 }
45 45
46 protected: 46 protected:
47 scoped_ptr<ShillServiceClient> client_; 47 scoped_ptr<ShillServiceClient> client_;
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 PrepareForMethodCall(flimflam::kActivateCellularModemFunction, 286 PrepareForMethodCall(flimflam::kActivateCellularModemFunction,
287 base::Bind(&ExpectStringArgument, kCarrier), 287 base::Bind(&ExpectStringArgument, kCarrier),
288 response.get()); 288 response.get());
289 // Call method. 289 // Call method.
290 const bool result = client_->CallActivateCellularModemAndBlock( 290 const bool result = client_->CallActivateCellularModemAndBlock(
291 dbus::ObjectPath(kExampleServicePath), kCarrier); 291 dbus::ObjectPath(kExampleServicePath), kCarrier);
292 EXPECT_TRUE(result); 292 EXPECT_TRUE(result);
293 } 293 }
294 294
295 } // namespace chromeos 295 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/shill_profile_client_unittest.cc ('k') | chromeos/network/onc/onc_certificate_importer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698