BASELINE: Update Chromium to 59.0.3071.134

Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 8 insertions, 14 deletions

diff --git a/chromium/components/web_cache/browser/web_cache_manager.cc b/chromium/components/web_cache/browser/web_cache_manager.cc
index fe215e6a3c3..e94ef7f3801 100644
--- a/chromium/components/web_cache/browser/web_cache_manager.cc
+++ b/chromium/components/web_cache/browser/web_cache_manager.cc
@@ -94,7 +94,7 @@ void WebCacheManager::Add(int renderer_id) {
       content::RenderProcessHost::FromID(renderer_id);
   if (host) {
     mojom::WebCachePtr service;
-    host->GetRemoteInterfaces()->GetInterface(&service);
+    BindInterface(host, &service);
     web_cache_services_[renderer_id] = std::move(service);
   }
 
diff --git a/chromium/components/web_cache/browser/web_cache_manager_unittest.cc b/chromium/components/web_cache/browser/web_cache_manager_unittest.cc
index e697b36e217..b8f50253499 100644
--- a/chromium/components/web_cache/browser/web_cache_manager_unittest.cc
+++ b/chromium/components/web_cache/browser/web_cache_manager_unittest.cc
@@ -6,15 +6,12 @@
 
 #include <string>
 
-#include "base/message_loop/message_loop.h"
 #include "components/web_cache/browser/web_cache_manager.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
-using content::BrowserThread;
-
 namespace web_cache {
 
 class WebCacheManagerTest : public testing::Test {
@@ -28,9 +25,7 @@ class WebCacheManagerTest : public testing::Test {
   static const WebCacheManager::RendererInfo kStats;
   static const WebCacheManager::RendererInfo kStats2;
 
-  WebCacheManagerTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_) {
-  }
+  WebCacheManagerTest() = default;
 
   // Thunks to access protected members of WebCacheManager
   static std::map<int, WebCacheManager::RendererInfo>& stats(
@@ -99,8 +94,7 @@ class WebCacheManagerTest : public testing::Test {
 
  private:
   WebCacheManager manager_;
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 };
 
 // static
diff --git a/chromium/components/web_cache/renderer/web_cache_impl.cc b/chromium/components/web_cache/renderer/web_cache_impl.cc
index 664c4fff595..c4e73bf95f5 100644
--- a/chromium/components/web_cache/renderer/web_cache_impl.cc
+++ b/chromium/components/web_cache/renderer/web_cache_impl.cc
@@ -36,7 +36,7 @@ void WebCacheImpl::ExecutePendingClearCache() {
     case kNavigate_Pending:
       break;
     case kClearCache_Pending:
-      blink::WebCache::clear();
+      blink::WebCache::Clear();
       clear_cache_state_ = kInit;
       break;
   }
@@ -45,12 +45,12 @@ void WebCacheImpl::ExecutePendingClearCache() {
 void WebCacheImpl::SetCacheCapacity(uint64_t capacity64) {
   size_t capacity = base::checked_cast<size_t>(capacity64);
 
-  blink::WebCache::setCapacity(capacity);
+  blink::WebCache::SetCapacity(capacity);
 }
 
 void WebCacheImpl::ClearCache(bool on_navigation) {
   if (!on_navigation) {
-    blink::WebCache::clear();
+    blink::WebCache::Clear();
     return;
   }
 
@@ -59,7 +59,7 @@ void WebCacheImpl::ClearCache(bool on_navigation) {
       clear_cache_state_ = kClearCache_Pending;
       break;
     case kNavigate_Pending:
-      blink::WebCache::clear();
+      blink::WebCache::Clear();
       clear_cache_state_ = kInit;
       break;
     case kClearCache_Pending: