Plumb requireInteraction to PlatformNotificationData & database

content/child/notifications/notification_data_conversions_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/notifications/notification_data_conversions.h"
 
 #include <stdint.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/platform_notification_data.h"
@@ skipping 21 matching lines @@
   blink::WebNotificationData web_data;
   web_data.title = blink::WebString::fromUTF8(kNotificationTitle);
   web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
   web_data.lang = blink::WebString::fromUTF8(kNotificationLang);
   web_data.body = blink::WebString::fromUTF8(kNotificationBody);
   web_data.tag = blink::WebString::fromUTF8(kNotificationTag);
   web_data.icon = blink::WebURL(GURL(kNotificationIconUrl));
   web_data.vibrate = blink::WebVector<int>(
       kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern));
   web_data.silent = true;
+  web_data.requireInteraction = true;
   web_data.data = blink::WebVector<char>(kNotificationData,
                                          arraysize(kNotificationData));
 
   web_data.actions = blink::WebVector<blink::WebNotificationAction>(
       static_cast<size_t>(2));
   web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name);
   web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title);
   web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name);
   web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title);
 
   PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
   EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
   EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT,
             platform_data.direction);
   EXPECT_EQ(kNotificationLang, platform_data.lang);
   EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
   EXPECT_EQ(kNotificationTag, platform_data.tag);
   EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
   EXPECT_TRUE(platform_data.silent);
+  EXPECT_TRUE(platform_data.require_interaction);
 
   EXPECT_THAT(platform_data.vibration_pattern,
       testing::ElementsAreArray(kNotificationVibrationPattern));
 
   ASSERT_EQ(web_data.data.size(), platform_data.data.size());
   for (size_t i = 0; i < web_data.data.size(); ++i)
     EXPECT_EQ(web_data.data[i], platform_data.data[i]);
   ASSERT_EQ(web_data.actions.size(), platform_data.actions.size());
   EXPECT_EQ(kAction1Name, platform_data.actions[0].action);
   EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title);
@@ skipping 12 matching lines @@
   PlatformNotificationData platform_data;
   platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
   platform_data.direction =
       PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
   platform_data.lang = kNotificationLang;
   platform_data.body = base::ASCIIToUTF16(kNotificationBody);
   platform_data.tag = kNotificationTag;
   platform_data.icon = GURL(kNotificationIconUrl);
   platform_data.vibration_pattern = vibration_pattern;
   platform_data.silent = true;
+  platform_data.require_interaction = true;
   platform_data.data = developer_data;
   platform_data.actions.resize(2);
   platform_data.actions[0].action = kAction1Name;
   platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title);
   platform_data.actions[1].action = kAction2Name;
   platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title);
 
   blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
   EXPECT_EQ(kNotificationTitle, web_data.title);
   EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
             web_data.direction);
   EXPECT_EQ(kNotificationLang, web_data.lang);
   EXPECT_EQ(kNotificationBody, web_data.body);
   EXPECT_EQ(kNotificationTag, web_data.tag);
   EXPECT_EQ(kNotificationIconUrl, web_data.icon.string());
 
   ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size());
   for (size_t i = 0; i < vibration_pattern.size(); ++i)
     EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]);
 
   EXPECT_TRUE(web_data.silent);
+  EXPECT_TRUE(web_data.requireInteraction);
 
   ASSERT_EQ(developer_data.size(), web_data.data.size());
   for (size_t i = 0; i < developer_data.size(); ++i)
     EXPECT_EQ(developer_data[i], web_data.data[i]);
 
   ASSERT_EQ(platform_data.actions.size(), web_data.actions.size());
   EXPECT_EQ(kAction1Name, web_data.actions[0].action);
   EXPECT_EQ(kAction1Title, web_data.actions[0].title);
   EXPECT_EQ(kAction2Name, web_data.actions[1].action);
   EXPECT_EQ(kAction2Title, web_data.actions[1].title);
@@ skipping 24 matching lines @@
       platform_data.direction = pair.second;
 
       blink::WebNotificationData web_data =
           ToWebNotificationData(platform_data);
       EXPECT_EQ(pair.first, web_data.direction);
     }
   }
 }
 
 }  // namespace content