Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1001)

Unified Diff: third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ac3ca7ce24fa2f47275671806a9c6abc713e19d3..d091b7e87cc891a19a8cc5b4611e3946dee3c992 100644
--- a/third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp
+++ b/third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp
@@ -46,7 +46,7 @@ public:
m_executionContext = adoptRefWillBeNoop(new NullExecutionContext());
}
- ExecutionContext* executionContext() { return m_executionContext.get(); }
+ ExecutionContext* getExecutionContext() { return m_executionContext.get(); }
private:
RefPtrWillBePersistent<ExecutionContext> m_executionContext;
@@ -87,7 +87,7 @@ TEST_F(NotificationDataTest, ReflectProperties)
// TODO(peter): Test |options.data| and |notificationData.data|.
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
ASSERT_FALSE(exceptionState.hadException());
EXPECT_EQ(kNotificationTitle, notificationData.title);
@@ -128,7 +128,7 @@ TEST_F(NotificationDataTest, SilentNotificationWithVibration)
options.setSilent(true);
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
ASSERT_TRUE(exceptionState.hadException());
EXPECT_EQ("Silent notifications must not specify vibration patterns.", exceptionState.message());
@@ -141,7 +141,7 @@ TEST_F(NotificationDataTest, RenotifyWithEmptyTag)
options.setRenotify(true);
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
ASSERT_TRUE(exceptionState.hadException());
EXPECT_EQ("Notifications which set the renotify flag must specify a non-empty tag.", exceptionState.message());
@@ -163,7 +163,7 @@ TEST_F(NotificationDataTest, InvalidIconUrls)
options.setActions(actions);
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
ASSERT_FALSE(exceptionState.hadException());
EXPECT_TRUE(notificationData.icon.isEmpty());
@@ -184,7 +184,7 @@ TEST_F(NotificationDataTest, VibrationNormalization)
options.setVibrate(vibrationSequence);
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
EXPECT_FALSE(exceptionState.hadException());
Vector<int> normalizedPattern;
@@ -201,7 +201,7 @@ TEST_F(NotificationDataTest, DefaultTimestampValue)
NotificationOptions options;
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
EXPECT_FALSE(exceptionState.hadException());
// The timestamp should be set to the current time since the epoch if it wasn't supplied by the developer.
@@ -224,7 +224,7 @@ TEST_F(NotificationDataTest, DirectionValues)
options.setDir(direction);
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
ASSERT_FALSE(exceptionState.hadException());
EXPECT_EQ(mappings.get(direction), notificationData.direction);
@@ -246,7 +246,7 @@ TEST_F(NotificationDataTest, MaximumActionCount)
options.setActions(actions);
TrackExceptionState exceptionState;
- WebNotificationData notificationData = createWebNotificationData(executionContext(), kNotificationTitle, options, exceptionState);
+ WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
ASSERT_FALSE(exceptionState.hadException());
// The stored actions will be capped to |maxActions| entries.

Powered by Google App Engine
This is Rietveld 408576698