Snapshot of all changes to get jumbo in blink and content.

third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp

Index: third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp
diff --git a/third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp b/third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp
index 839c2dd65e720bd33d75b2db987d5a79411b2ef5..8af7a6b8e7513ce327976b5f7044d03c8e00075b 100644
--- a/third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp
+++ b/third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp
@@ -17,7 +17,7 @@
 namespace blink {
 namespace {
 
-const char kBaseUrl[] = "https://example.com/directory/";
+const char kNotificationBaseUrl[] = "https://example.com/directory/";
 const char kNotificationTitle[] = "My Notification";
 
 const char kNotificationDir[] = "rtl";
@@ -67,7 +67,7 @@ class CompleteUrlExecutionContext final : public NullExecutionContext {
 class NotificationDataTest : public ::testing::Test {
  public:
   void SetUp() override {
-    execution_context_ = new CompleteUrlExecutionContext(kBaseUrl);
+    execution_context_ = new CompleteUrlExecutionContext(kNotificationBaseUrl);
   }
 
   ExecutionContext* GetExecutionContext() { return execution_context_.Get(); }
@@ -126,7 +126,7 @@ TEST_F(NotificationDataTest, ReflectProperties) {
   EXPECT_EQ(kNotificationBody, notification_data.body);
   EXPECT_EQ(kNotificationTag, notification_data.tag);
 
-  KURL base(kParsedURLString, kBaseUrl);
+  KURL base(kParsedURLString, kNotificationBaseUrl);
 
   // URLs should be resolved against the base URL of the execution context.
   EXPECT_EQ(WebURL(KURL(base, kNotificationImage)), notification_data.image);