Remove the custom base64url implementation from //sync

BUG=536745

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

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

3 files changed, 4 insertions, 16 deletions

diff --git a/sync/internal_api/attachments/attachment_uploader_impl.cc b/sync/internal_api/attachments/attachment_uploader_impl.cc
index 4dc410a..3566beb 100644
--- a/sync/internal_api/attachments/attachment_uploader_impl.cc
+++ b/sync/internal_api/attachments/attachment_uploader_impl.cc
@@ -5,13 +5,13 @@
 #include "sync/internal_api/public/attachments/attachment_uploader_impl.h"
 
 #include "base/base64.h"
+#include "base/base64url.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_piece.h"
-#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "base/threading/non_thread_safe.h"
@@ -381,7 +381,9 @@ void AttachmentUploaderImpl::ConfigureURLFetcherCommon(
   // Encode the birthday.  Birthday is opaque so we assume it could contain
   // anything.  Encode it so that it's safe to pass as an HTTP header value.
   std::string encoded_store_birthday;
-  Base64URLSafeEncode(raw_store_birthday, &encoded_store_birthday);
+  base::Base64UrlEncode(
+      raw_store_birthday, base::Base64UrlEncodePolicy::OMIT_PADDING,
+      &encoded_store_birthday);
   fetcher->AddExtraRequestHeader(base::StringPrintf(
       "%s: %s", kSyncStoreBirthday, encoded_store_birthday.c_str()));
 
@@ -392,12 +394,4 @@ void AttachmentUploaderImpl::ConfigureURLFetcherCommon(
       base::StringPrintf("%s: %d", kSyncDataTypeId, field_number));
 }
 
-void AttachmentUploaderImpl::Base64URLSafeEncode(const std::string& input,
-                                                 std::string* output) {
-  base::Base64Encode(input, output);
-  base::ReplaceChars(*output, "+", "-", output);
-  base::ReplaceChars(*output, "/", "_", output);
-  base::TrimString(*output, "=", output);
-}
-
 }  // namespace syncer
diff --git a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
index bd0ae51..b4653a25 100644
--- a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
+++ b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "sync/internal_api/public/attachments/attachment_uploader_impl.h"
 
-#include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
diff --git a/sync/internal_api/public/attachments/attachment_uploader_impl.h b/sync/internal_api/public/attachments/attachment_uploader_impl.h
index 212acae..2a41499 100644
--- a/sync/internal_api/public/attachments/attachment_uploader_impl.h
+++ b/sync/internal_api/public/attachments/attachment_uploader_impl.h
@@ -80,11 +80,6 @@ class SYNC_EXPORT AttachmentUploaderImpl : public AttachmentUploader,
 
   void OnUploadStateStopped(const UniqueId& unique_id);
 
-  // Encodes |input| into |output| using URL safe base64, no padding.
-  // NOTE: Safe to use the same variable for both |input| and |output|.
-  static void Base64URLSafeEncode(const std::string& input,
-                                  std::string* output);
-
   GURL sync_service_url_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   std::string account_id_;