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

Side by Side Diff: chromeos/cryptohome/homedir_methods_unittest.cc

Issue 660663003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | chromeos/dbus/bluetooth_agent_service_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/cryptohome/homedir_methods.h" 5 #include "chromeos/cryptohome/homedir_methods.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 82
83 HomedirMethodsTest::~HomedirMethodsTest() { 83 HomedirMethodsTest::~HomedirMethodsTest() {
84 } 84 }
85 85
86 void HomedirMethodsTest::SetUp() { 86 void HomedirMethodsTest::SetUp() {
87 scoped_ptr<chromeos::MockCryptohomeClient> cryptohome_client( 87 scoped_ptr<chromeos::MockCryptohomeClient> cryptohome_client(
88 new chromeos::MockCryptohomeClient); 88 new chromeos::MockCryptohomeClient);
89 cryptohome_client_ = cryptohome_client.get(); 89 cryptohome_client_ = cryptohome_client.get();
90 chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient( 90 chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient(
91 cryptohome_client.PassAs<chromeos::CryptohomeClient>()); 91 cryptohome_client.Pass());
92 HomedirMethods::Initialize(); 92 HomedirMethods::Initialize();
93 } 93 }
94 94
95 void HomedirMethodsTest::TearDown() { 95 void HomedirMethodsTest::TearDown() {
96 HomedirMethods::Shutdown(); 96 HomedirMethods::Shutdown();
97 chromeos::DBusThreadManager::Shutdown(); 97 chromeos::DBusThreadManager::Shutdown();
98 } 98 }
99 99
100 void HomedirMethodsTest::RunProtobufMethodCallback( 100 void HomedirMethodsTest::RunProtobufMethodCallback(
101 const chromeos::CryptohomeClient::ProtobufMethodCallback& callback) { 101 const chromeos::CryptohomeClient::ProtobufMethodCallback& callback) {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 EXPECT_EQ(kProviderData1Number, *provider_data->number.get()); 176 EXPECT_EQ(kProviderData1Number, *provider_data->number.get());
177 EXPECT_FALSE(provider_data->bytes); 177 EXPECT_FALSE(provider_data->bytes);
178 provider_data = &key_definition.provider_data[1]; 178 provider_data = &key_definition.provider_data[1];
179 EXPECT_EQ(kProviderData2Name, provider_data->name); 179 EXPECT_EQ(kProviderData2Name, provider_data->name);
180 EXPECT_FALSE(provider_data->number); 180 EXPECT_FALSE(provider_data->number);
181 ASSERT_TRUE(provider_data->bytes); 181 ASSERT_TRUE(provider_data->bytes);
182 EXPECT_EQ(kProviderData2Bytes, *provider_data->bytes.get()); 182 EXPECT_EQ(kProviderData2Bytes, *provider_data->bytes.get());
183 } 183 }
184 184
185 } // namespace cryptohome 185 } // namespace cryptohome
OLDNEW
« no previous file with comments | « no previous file | chromeos/dbus/bluetooth_agent_service_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698