Clean up the TestRunner methods exposed for Web Notifications.

content/shell/renderer/test_runner/TestRunner.cpp

 // Copyright 2013 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.
 
 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Pawel Hajdan (phajdan.jr@chromium.org)
  * Copyright (C) 2012 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 278 matching lines @@
     bindMethod("clearAllDatabases", &TestRunner::clearAllDatabases);
     bindMethod("setDatabaseQuota", &TestRunner::setDatabaseQuota);
     bindMethod("setAlwaysAcceptCookies", &TestRunner::setAlwaysAcceptCookies);
     bindMethod("setWindowIsKey", &TestRunner::setWindowIsKey);
     bindMethod("pathToLocalResource", &TestRunner::pathToLocalResource);
     bindMethod("setBackingScaleFactor", &TestRunner::setBackingScaleFactor);
     bindMethod("setPOSIXLocale", &TestRunner::setPOSIXLocale);
     bindMethod("setMIDIAccessorResult", &TestRunner::setMIDIAccessorResult);
     bindMethod("setMIDISysExPermission", &TestRunner::setMIDISysExPermission);
     bindMethod("grantWebNotificationPermission", &TestRunner::grantWebNotificationPermission);
-    bindMethod("simulateLegacyWebNotificationClick", &TestRunner::simulateLegacyWebNotificationClick);
-    bindMethod("cancelAllActiveNotifications", &TestRunner::cancelAllActiveNotifications);
+    bindMethod("simulateWebNotificationClick", &TestRunner::simulateWebNotificationClick);
     bindMethod("addMockSpeechInputResult", &TestRunner::addMockSpeechInputResult);
     bindMethod("setMockSpeechInputDumpRect", &TestRunner::setMockSpeechInputDumpRect);
     bindMethod("addMockSpeechRecognitionResult", &TestRunner::addMockSpeechRecognitionResult);
     bindMethod("setMockSpeechRecognitionError", &TestRunner::setMockSpeechRecognitionError);
     bindMethod("wasMockSpeechRecognitionAborted", &TestRunner::wasMockSpeechRecognitionAborted);
     bindMethod("display", &TestRunner::display);
     bindMethod("displayInvalidatedRegion", &TestRunner::displayInvalidatedRegion);
     bindMethod("isChooserShown", &TestRunner::isChooserShown);
 
     // The following modify WebPageOverlays.
     bindMethod("addWebPageOverlay", &TestRunner::addWebPageOverlay);
     bindMethod("removeWebPageOverlay", &TestRunner::removeWebPageOverlay);
 
     // Properties.
     bindProperty("globalFlag", &m_globalFlag);
     bindProperty("platformName", &m_platformName);
     bindProperty("tooltipText", &m_tooltipText);
     bindProperty("disableNotifyDone", &m_disableNotifyDone);
 
     // webHistoryItemCount is used by tests in LayoutTests\http\tests\history
     bindProperty("webHistoryItemCount", &m_webHistoryItemCount);
     bindProperty("interceptPostMessage", &m_interceptPostMessage);
 
     // The following are stubs.
     bindMethod("dumpDatabaseCallbacks", &TestRunner::notImplemented);
-    bindMethod("denyWebNotificationPermission", &TestRunner::notImplemented);
-    bindMethod("removeAllWebNotificationPermissions", &TestRunner::notImplemented);
-    bindMethod("simulateWebNotificationClick", &TestRunner::notImplemented);
     bindMethod("setIconDatabaseEnabled", &TestRunner::notImplemented);
     bindMethod("setScrollbarPolicy", &TestRunner::notImplemented);
     bindMethod("clearAllApplicationCaches", &TestRunner::notImplemented);
     bindMethod("clearApplicationCacheForOrigin", &TestRunner::notImplemented);
     bindMethod("clearBackForwardList", &TestRunner::notImplemented);
     bindMethod("keepWebHistory", &TestRunner::notImplemented);
     bindMethod("setApplicationCacheOriginQuota", &TestRunner::notImplemented);
     bindMethod("setCallCloseOnWebViews", &TestRunner::notImplemented);
     bindMethod("setMainFrameIsFirstResponder", &TestRunner::notImplemented);
     bindMethod("setUseDashboardCompatibilityMode", &TestRunner::notImplemented);
@@ skipping 1486 matching lines @@
     if (arguments.size() < 1 || !arguments[0].isString())
         return;
 
     bool permissionGranted = true;
     if (arguments.size() == 2 && arguments[1].isBool())
         permissionGranted = arguments[1].toBoolean();
 
     notification_presenter_->GrantPermission(arguments[0].toString(), permissionGranted);
 }
 
-void TestRunner::simulateLegacyWebNotificationClick(const CppArgumentList& arguments, CppVariant* result)
+void TestRunner::simulateWebNotificationClick(const CppArgumentList& arguments, CppVariant* result)
 {
     if (arguments.size() != 1 || !arguments[0].isString()) {
         result->set(false);
         return;
     }
     result->set(notification_presenter_->SimulateClick(arguments[0].toString()));
 }
 
-void TestRunner::cancelAllActiveNotifications(const CppArgumentList& arguments, CppVariant* result)
-{
-    notification_presenter_->CancelAllActiveNotifications();
-    result->set(true);
-}
-
 void TestRunner::addMockSpeechInputResult(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
     if (arguments.size() < 3 || !arguments[0].isString() || !arguments[1].isNumber() || !arguments[2].isString())
         return;
 
 #if ENABLE_INPUT_SPEECH
     m_proxy->speechInputControllerMock()->addMockRecognitionResult(WebString::fromUTF8(arguments[0].toString()), arguments[1].toDouble(), WebString::fromUTF8(arguments[2].toString()));
 #endif
 }
@@ skipping 259 matching lines @@
     result->setNull();
 }
 
 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, CppVariant* result)
 {
     m_pointerLockPlannedResult = PointerLockWillFailSync;
     result->setNull();
 }
 
 }