chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc - Issue 2561203002: Migrate weave-related classes from proximity_auth/ble to cryptauth/ble.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

Issue 2561203002: Migrate weave-related classes from proximity_auth/ble to cryptauth/ble. (Closed)

Patch Set: Rebase. Created 4 years 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

« no previous file with comments | « chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h ('k') | chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h » ('j') | components/cryptauth/ble/bluetooth_low_energy_characteristics_finder_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

index 701a7153d66f0c3c44447ce3b4dcc6f571d5bc5c..840f60d3f204c7c3f67b69f7fb805a53e4c70c6b 100644

--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

@@ -29,6 +29,7 @@

#include "chrome/browser/ui/proximity_auth/proximity_auth_error_bubble.h"

#include "chrome/common/extensions/api/easy_unlock_private.h"

#include "chrome/grit/generated_resources.h"

+#include "components/cryptauth/bluetooth_throttler_impl.h"

#include "components/cryptauth/cryptauth_device_manager.h"

#include "components/cryptauth/cryptauth_enrollment_manager.h"

#include "components/cryptauth/cryptauth_enrollment_utils.h"

@@ -37,7 +38,6 @@

#include "components/cryptauth/secure_message_delegate.h"

#include "components/proximity_auth/ble/bluetooth_low_energy_connection.h"

#include "components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h"

-#include "components/proximity_auth/bluetooth_throttler_impl.h"

#include "components/proximity_auth/bluetooth_util.h"

#include "components/proximity_auth/logging/logging.h"

#include "components/proximity_auth/proximity_auth_client.h"

@@ -1050,7 +1050,7 @@ EasyUnlockPrivateSetAutoPairingResultFunction::Run() {

EasyUnlockPrivateFindSetupConnectionFunction::

EasyUnlockPrivateFindSetupConnectionFunction()

- : bluetooth_throttler_(new proximity_auth::BluetoothThrottlerImpl(

+ : bluetooth_throttler_(new cryptauth::BluetoothThrottlerImpl(

base::MakeUnique<base::DefaultTickClock>())) {}

EasyUnlockPrivateFindSetupConnectionFunction::

@@ -1069,7 +1069,7 @@ void EasyUnlockPrivateFindSetupConnectionFunction::

}

void EasyUnlockPrivateFindSetupConnectionFunction::OnConnectionFound(

- std::unique_ptr<proximity_auth::Connection> connection) {

+ std::unique_ptr<cryptauth::Connection> connection) {

// Connection are not persistent by default.

std::string device_address = connection->remote_device().bluetooth_address;

bool persistent = false;