Move base64url.* to CryptAuth component.

The cryptauth component also uses base64url encoding, but cannot depend on
proximity_auth.

BUG=420316

Review URL: https://codereview.chromium.org/1063323002

Cr-Commit-Position: refs/heads/master@{#324393}

chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc

@@ -17,7 +17,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/easy_unlock_client.h"
 #include "chromeos/login/auth/key.h"
-#include "components/proximity_auth/base64url.h"
+#include "components/proximity_auth/cryptauth/base64url.h"
 #include "crypto/encryptor.h"
 #include "crypto/random.h"
 #include "crypto/symmetric_key.h"

components/components_tests.gyp

@@ -391,11 +391,11 @@
       'precache/core/precache_url_table_unittest.cc',
     ],
     'proximity_auth_unittest_sources': [
-      'proximity_auth/base64url_unittest.cc',
       'proximity_auth/bluetooth_connection_finder_unittest.cc',
       'proximity_auth/bluetooth_connection_unittest.cc',
       'proximity_auth/client_unittest.cc',
       'proximity_auth/connection_unittest.cc',
+      'proximity_auth/cryptauth/base64url_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_client_impl_unittest.cc',

components/proximity_auth.gypi

@@ -16,8 +16,6 @@
         '../net/net.gyp:net',
       ],
       'sources': [
-        "proximity_auth/base64url.cc",
-        "proximity_auth/base64url.h",
         "proximity_auth/bluetooth_connection.cc",
         "proximity_auth/bluetooth_connection.h",
         "proximity_auth/bluetooth_connection_finder.cc",
@@ -71,6 +69,8 @@
         '../net/net.gyp:net',
       ],
       'sources': [
+        "proximity_auth/cryptauth/base64url.cc",
+        "proximity_auth/cryptauth/base64url.h",
         "proximity_auth/cryptauth/cryptauth_access_token_fetcher.h",
         "proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl.cc",
         "proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl.h",

components/proximity_auth/BUILD.gn

@@ -6,8 +6,6 @@ import("//testing/test.gni")
 
 source_set("proximity_auth") {
   sources = [
-    "base64url.cc",
-    "base64url.h",
     "bluetooth_connection.cc",
     "bluetooth_connection.h",
     "bluetooth_connection_finder.cc",
@@ -44,7 +42,6 @@ source_set("proximity_auth") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "base64url_unittest.cc",
     "bluetooth_connection_finder_unittest.cc",
     "bluetooth_connection_unittest.cc",
     "client_unittest.cc",

components/proximity_auth/client.cc

@@ -7,9 +7,9 @@
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
-#include "components/proximity_auth/base64url.h"
 #include "components/proximity_auth/client_observer.h"
 #include "components/proximity_auth/connection.h"
+#include "components/proximity_auth/cryptauth/base64url.h"
 #include "components/proximity_auth/remote_status_update.h"
 #include "components/proximity_auth/secure_context.h"
 #include "components/proximity_auth/wire_message.h"

components/proximity_auth/cryptauth/BUILD.gn

@@ -4,6 +4,8 @@
 
 source_set("cryptauth") {
   sources = [
+    "base64url.cc",
+    "base64url.h",
     "cryptauth_access_token_fetcher.h",
     "cryptauth_access_token_fetcher_impl.cc",
     "cryptauth_access_token_fetcher_impl.h",
@@ -48,6 +50,7 @@ source_set("test_support") {
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "base64url_unittest.cc",
     "cryptauth_access_token_fetcher_impl_unittest.cc",
     "cryptauth_api_call_flow_unittest.cc",
     "cryptauth_client_impl_unittest.cc",

components/proximity_auth/base64url.cc → components/proximity_auth/cryptauth/base64url.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/proximity_auth/base64url.h"
+#include "components/proximity_auth/cryptauth/base64url.h"
 
 #include "base/base64.h"
 #include "base/strings/string_util.h"

components/proximity_auth/base64url.h → components/proximity_auth/cryptauth/base64url.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PROXIMITY_BASE64URL_H
-#define COMPONENTS_PROXIMITY_BASE64URL_H
+#ifndef COMPONENTS_PROXIMITY_AUTH_CRYPTAUTH_BASE64URL_H
+#define COMPONENTS_PROXIMITY_AUTH_CRYPTAUTH_BASE64URL_H
 
 #include <string>
 

components/proximity_auth/base64url_unittest.cc → components/proximity_auth/cryptauth/base64url_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/proximity_auth/base64url.h"
+#include "components/proximity_auth/cryptauth/base64url.h"
 
 #include "base/base64.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc

@@ -5,7 +5,7 @@
 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h"
 
 #include "base/sha1.h"
-#include "components/proximity_auth/base64url.h"
+#include "components/proximity_auth/cryptauth/base64url.h"
 
 namespace proximity_auth {
 

components/proximity_auth/wire_message.cc

@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/values.h"
-#include "components/proximity_auth/base64url.h"
+#include "components/proximity_auth/cryptauth/base64url.h"
 
 // The wire messages have a simple format:
 // [ message version ] [ body length ] [ JSON body ]