Revert of Hook up ProximityAuthSystem in EasyUnlockService.

components/proximity_auth/messenger_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/proximity_auth/messenger_impl.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/proximity_auth/connection.h"
 #include "components/proximity_auth/fake_connection.h"
 #include "components/proximity_auth/messenger_observer.h"
-#include "components/proximity_auth/proximity_auth_test_util.h"
 #include "components/proximity_auth/remote_device.h"
 #include "components/proximity_auth/remote_status_update.h"
 #include "components/proximity_auth/secure_context.h"
 #include "components/proximity_auth/wire_message.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::AllOf;
 using testing::EndsWith;
@@ skipping 62 matching lines @@
  private:
   // The messenger that |this| instance observes.
   Messenger* const messenger_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMessengerObserver);
 };
 
 class TestMessenger : public MessengerImpl {
  public:
   TestMessenger()
-      : MessengerImpl(make_scoped_ptr(new FakeConnection(
-                          CreateClassicRemoteDeviceForTest())),
+      : MessengerImpl(make_scoped_ptr(new FakeConnection(RemoteDevice())),
                       make_scoped_ptr(new NiceMock<MockSecureContext>())) {}
   ~TestMessenger() override {}
 
   // Simple getters for the mock objects owned by |this| messenger.
   FakeConnection* GetFakeConnection() {
     return static_cast<FakeConnection*>(connection());
   }
   MockSecureContext* GetMockSecureContext() {
     return static_cast<MockSecureContext*>(secure_context());
   }
@@ skipping 354 matching lines @@
       "\"data\":\"YSB3aW5uZXIgaXMgeW91\""
       "}, but encoded");
 
   // The unlock request should have remained buffered, and should only now be
   // sent.
   EXPECT_CALL(observer, OnUnlockResponse(false));
   messenger.GetFakeConnection()->FinishSendingMessageWithSuccess(false);
 }
 
 }  // namespace proximity_auth