BASELINE: Update Chromium to 53.0.2785.41

Also adds a few extra files for extensions.

Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 12 insertions, 12 deletions

diff --git a/chromium/components/favicon/core/fallback_icon_service.cc b/chromium/components/favicon/core/fallback_icon_service.cc
index 25efd996ff6..283808858a5 100644
--- a/chromium/components/favicon/core/fallback_icon_service.cc
+++ b/chromium/components/favicon/core/fallback_icon_service.cc
@@ -79,9 +79,8 @@ void FallbackIconService::DrawFallbackIcon(
   canvas->DrawStringRectWithFlags(
       icon_text,
       gfx::FontList(fallback_icon_client_->GetFontNameList(), gfx::Font::NORMAL,
-                    font_size),
-      style.text_color,
-      gfx::Rect(kOffsetX, kOffsetY, size, size),
+                    font_size, gfx::Font::Weight::NORMAL),
+      style.text_color, gfx::Rect(kOffsetX, kOffsetY, size, size),
       gfx::Canvas::TEXT_ALIGN_CENTER);
 }
 
diff --git a/chromium/components/favicon/core/large_icon_service_unittest.cc b/chromium/components/favicon/core/large_icon_service_unittest.cc
index 41581139628..4775eaff067 100644
--- a/chromium/components/favicon/core/large_icon_service_unittest.cc
+++ b/chromium/components/favicon/core/large_icon_service_unittest.cc
@@ -11,6 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/favicon/core/favicon_client.h"
 #include "components/favicon/core/favicon_service.h"
@@ -164,7 +165,7 @@ TEST_F(LargeIconServiceTest, SameSize) {
       24,  // |desired_size_in_pixel|
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -177,7 +178,7 @@ TEST_F(LargeIconServiceTest, ScaleDown) {
       24,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -190,7 +191,7 @@ TEST_F(LargeIconServiceTest, ScaleUp) {
       24,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -204,7 +205,7 @@ TEST_F(LargeIconServiceTest, NoScale) {
       0,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -218,7 +219,7 @@ TEST_F(LargeIconServiceTest, FallbackSinceIconTooSmall) {
       24,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -232,7 +233,7 @@ TEST_F(LargeIconServiceTest, FallbackSinceIconNotSquare) {
       24,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -246,7 +247,7 @@ TEST_F(LargeIconServiceTest, FallbackSinceIconMissing) {
       24,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -260,7 +261,7 @@ TEST_F(LargeIconServiceTest, FallbackSinceIconMissingNoScale) {
       0,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }
 
@@ -276,7 +277,7 @@ TEST_F(LargeIconServiceTest, FallbackSinceTooPicky) {
       24,
       base::Bind(&LargeIconServiceTest::ResultCallback, base::Unretained(this)),
       &cancelable_task_tracker_);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(is_callback_invoked_);
 }