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

Unified Diff: components/proximity_auth/remote_device_life_cycle_impl_unittest.cc

Issue 1377313002: Revert of Hook up ProximityAuthSystem in EasyUnlockService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth_connection
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: components/proximity_auth/remote_device_life_cycle_impl_unittest.cc
diff --git a/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc b/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc
index 653e77e63b33fb15078c65ccb3490f952b61c5cd..65d86131e927c76dbcf3ee7fee1e79934960be10 100644
--- a/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc
+++ b/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc
@@ -86,13 +86,8 @@
class FakeAuthenticator : public Authenticator {
public:
- FakeAuthenticator(Connection* connection) : connection_(connection) {}
- ~FakeAuthenticator() override {
- // This object should be destroyed immediately after authentication is
- // complete in order not to outlive the underlying connection.
- EXPECT_FALSE(callback_.is_null());
- EXPECT_EQ(std::string(), connection_->remote_device().public_key);
- }
+ FakeAuthenticator() {}
+ ~FakeAuthenticator() override {}
void OnAuthenticationResult(Authenticator::Result result) {
ASSERT_FALSE(callback_.is_null());
@@ -109,8 +104,6 @@
callback_ = callback;
}
- Connection* connection_;
-
AuthenticationCallback callback_;
DISALLOW_COPY_AND_ASSIGN(FakeAuthenticator);
@@ -137,9 +130,7 @@
}
scoped_ptr<Authenticator> CreateAuthenticator() override {
- EXPECT_TRUE(connection_finder_);
- scoped_ptr<FakeAuthenticator> scoped_authenticator(
- new FakeAuthenticator(connection_finder_->connection()));
+ scoped_ptr<FakeAuthenticator> scoped_authenticator(new FakeAuthenticator());
authenticator_ = scoped_authenticator.get();
return scoped_authenticator.Pass();
}
« no previous file with comments | « components/proximity_auth/remote_device_life_cycle_impl.cc ('k') | components/proximity_auth/screenlock_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698