BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

7 files changed, 36 insertions, 24 deletions

diff --git a/chromium/components/search_provider_logos/google_logo_api_unittest.cc b/chromium/components/search_provider_logos/google_logo_api_unittest.cc
index c856e5923ff..c35b4a0e42e 100644
--- a/chromium/components/search_provider_logos/google_logo_api_unittest.cc
+++ b/chromium/components/search_provider_logos/google_logo_api_unittest.cc
@@ -317,7 +317,7 @@ TEST(GoogleNewLogoApiTest, ParsesCapturedApiResult) {
   const GURL base_url("https://base.doo/");
 
   base::FilePath test_data_dir;
-  ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+  ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
   test_data_dir = test_data_dir.AppendASCII("components")
                       .AppendASCII("test")
                       .AppendASCII("data")
diff --git a/chromium/components/search_provider_logos/logo_cache.cc b/chromium/components/search_provider_logos/logo_cache.cc
index 7336f0f44e7..f4f6eceb16e 100644
--- a/chromium/components/search_provider_logos/logo_cache.cc
+++ b/chromium/components/search_provider_logos/logo_cache.cc
@@ -263,7 +263,7 @@ void LogoCache::WriteLogo(scoped_refptr<base::RefCountedMemory> encoded_image) {
   if (!EnsureCacheDirectoryExists())
     return;
 
-  if (!metadata_ || !encoded_image.get()) {
+  if (!metadata_ || !encoded_image) {
     DeleteLogoAndMetadata();
     return;
   }
diff --git a/chromium/components/search_provider_logos/logo_cache_unittest.cc b/chromium/components/search_provider_logos/logo_cache_unittest.cc
index cc1b4575151..39f0fe06914 100644
--- a/chromium/components/search_provider_logos/logo_cache_unittest.cc
+++ b/chromium/components/search_provider_logos/logo_cache_unittest.cc
@@ -137,7 +137,7 @@ class LogoCacheTest : public ::testing::Test {
       ASSERT_TRUE(retrieved_logo.get());
       ExpectLogosEqual(*expected_logo, *retrieved_logo);
     } else {
-      ASSERT_FALSE(retrieved_logo.get());
+      ASSERT_FALSE(retrieved_logo);
     }
   }
 
diff --git a/chromium/components/search_provider_logos/logo_common.cc b/chromium/components/search_provider_logos/logo_common.cc
index ff761679918..05aae77a8a8 100644
--- a/chromium/components/search_provider_logos/logo_common.cc
+++ b/chromium/components/search_provider_logos/logo_common.cc
@@ -11,18 +11,25 @@ namespace search_provider_logos {
 const int64_t kMaxTimeToLiveMS = INT64_C(30 * 24 * 60 * 60 * 1000);  // 30 days
 
 LogoMetadata::LogoMetadata() = default;
-LogoMetadata::LogoMetadata(const LogoMetadata& other) = default;
+LogoMetadata::LogoMetadata(const LogoMetadata&) = default;
+LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default;
+LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default;
+LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default;
 LogoMetadata::~LogoMetadata() = default;
 
 EncodedLogo::EncodedLogo() = default;
-EncodedLogo::EncodedLogo(const EncodedLogo& other) = default;
+EncodedLogo::EncodedLogo(const EncodedLogo&) = default;
+EncodedLogo::EncodedLogo(EncodedLogo&&) noexcept = default;
+EncodedLogo& EncodedLogo::operator=(const EncodedLogo&) = default;
+EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) noexcept = default;
 EncodedLogo::~EncodedLogo() = default;
 
 Logo::Logo() = default;
 Logo::~Logo() = default;
 
 LogoCallbacks::LogoCallbacks() = default;
-LogoCallbacks::LogoCallbacks(LogoCallbacks&&) = default;
+LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default;
+LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default;
 LogoCallbacks::~LogoCallbacks() = default;
 
 }  // namespace search_provider_logos
diff --git a/chromium/components/search_provider_logos/logo_common.h b/chromium/components/search_provider_logos/logo_common.h
index c0d4a6308c8..dd3f4c582e3 100644
--- a/chromium/components/search_provider_logos/logo_common.h
+++ b/chromium/components/search_provider_logos/logo_common.h
@@ -33,7 +33,10 @@ enum class LogoType {
 // serialize and deserialize that field.
 struct LogoMetadata {
   LogoMetadata();
-  LogoMetadata(const LogoMetadata& other);
+  LogoMetadata(const LogoMetadata&);
+  LogoMetadata(LogoMetadata&&) noexcept;
+  LogoMetadata& operator=(const LogoMetadata&);
+  LogoMetadata& operator=(LogoMetadata&&) noexcept;
   ~LogoMetadata();
 
   // For use by the client ----------------------------------------------------
@@ -116,7 +119,10 @@ enum class LogoCallbackReason {
 
 struct EncodedLogo {
   EncodedLogo();
-  EncodedLogo(const EncodedLogo& other);
+  EncodedLogo(const EncodedLogo&);
+  EncodedLogo(EncodedLogo&&) noexcept;
+  EncodedLogo& operator=(const EncodedLogo& other);
+  EncodedLogo& operator=(EncodedLogo&& other) noexcept;
   ~EncodedLogo();
 
   // The jpeg- or png-encoded image.
@@ -147,7 +153,8 @@ struct LogoCallbacks {
   LogoCallback on_fresh_decoded_logo_available;
 
   LogoCallbacks();
-  LogoCallbacks(LogoCallbacks&&);
+  LogoCallbacks(LogoCallbacks&&) noexcept;
+  LogoCallbacks& operator=(LogoCallbacks&&) noexcept;
   ~LogoCallbacks();
 };
 
diff --git a/chromium/components/search_provider_logos/logo_service_impl_unittest.cc b/chromium/components/search_provider_logos/logo_service_impl_unittest.cc
index 8a6040e93d8..83ac25aff14 100644
--- a/chromium/components/search_provider_logos/logo_service_impl_unittest.cc
+++ b/chromium/components/search_provider_logos/logo_service_impl_unittest.cc
@@ -17,7 +17,6 @@
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
diff --git a/chromium/components/search_provider_logos/logo_tracker.cc b/chromium/components/search_provider_logos/logo_tracker.cc
index 1324ddffa9d..4c48e4f3fe3 100644
--- a/chromium/components/search_provider_logos/logo_tracker.cc
+++ b/chromium/components/search_provider_logos/logo_tracker.cc
@@ -8,7 +8,6 @@
 #include <utility>
 
 #include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/task_runner_util.h"
 #include "base/task_scheduler/post_task.h"
@@ -287,7 +286,7 @@ void LogoTracker::OnFreshLogoParsed(bool* parsing_failed,
   if (logo)
     logo->metadata.source_url = logo_url_;
 
-  if (!logo || !logo->encoded_image.get()) {
+  if (!logo || !logo->encoded_image) {
     OnFreshLogoAvailable(std::move(logo), /*download_failed=*/false,
                          *parsing_failed, from_http_cache, SkBitmap());
   } else {
@@ -317,8 +316,8 @@ void LogoTracker::OnFreshLogoAvailable(
 
   if (download_failed) {
     download_outcome = DOWNLOAD_OUTCOME_DOWNLOAD_FAILED;
-  } else if (encoded_logo && !encoded_logo->encoded_image.get() &&
-             cached_logo_ && !encoded_logo->metadata.fingerprint.empty() &&
+  } else if (encoded_logo && !encoded_logo->encoded_image && cached_logo_ &&
+             !encoded_logo->metadata.fingerprint.empty() &&
              encoded_logo->metadata.fingerprint ==
                  cached_logo_->metadata.fingerprint) {
     // The cached logo was revalidated, i.e. its fingerprint was verified.
@@ -353,8 +352,8 @@ void LogoTracker::OnFreshLogoAvailable(
   LogoCallbackReason callback_type = LogoCallbackReason::FAILED;
   switch (download_outcome) {
     case DOWNLOAD_OUTCOME_NEW_LOGO_SUCCESS:
-      DCHECK(encoded_logo.get());
-      DCHECK(logo.get());
+      DCHECK(encoded_logo);
+      DCHECK(logo);
       callback_type = LogoCallbackReason::DETERMINED;
       break;
 
@@ -362,8 +361,8 @@ void LogoTracker::OnFreshLogoAvailable(
     case DOWNLOAD_OUTCOME_NO_LOGO_TODAY:
       // Clear the cached logo if it was non-null. Otherwise, report this as a
       // revalidation of "no logo".
-      DCHECK(!encoded_logo.get());
-      DCHECK(!logo.get());
+      DCHECK(!encoded_logo);
+      DCHECK(!logo);
       if (cached_logo_) {
         callback_type = LogoCallbackReason::DETERMINED;
       } else {
@@ -374,14 +373,14 @@ void LogoTracker::OnFreshLogoAvailable(
     case DOWNLOAD_OUTCOME_DOWNLOAD_FAILED:
       // In the download failed, don't notify the callback at all, since the
       // callback should continue to use the cached logo.
-      DCHECK(!encoded_logo.get());
-      DCHECK(!logo.get());
+      DCHECK(!encoded_logo);
+      DCHECK(!logo);
       callback_type = LogoCallbackReason::FAILED;
       break;
 
     case DOWNLOAD_OUTCOME_DECODING_FAILED:
-      DCHECK(encoded_logo.get());
-      DCHECK(!logo.get());
+      DCHECK(encoded_logo);
+      DCHECK(!logo);
       encoded_logo.reset();
       callback_type = LogoCallbackReason::FAILED;
       break;
@@ -390,8 +389,8 @@ void LogoTracker::OnFreshLogoAvailable(
       // In the server reported that the cached logo is still current, don't
       // notify the callback at all, since the callback should continue to use
       // the cached logo.
-      DCHECK(encoded_logo.get());
-      DCHECK(!logo.get());
+      DCHECK(encoded_logo);
+      DCHECK(!logo);
       callback_type = LogoCallbackReason::REVALIDATED;
       break;