Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / browser_plugin / test_browser_plugin_guest_delegate.cc

diff --git a/src/content/browser/browser_plugin/test_browser_plugin_guest_delegate.cc b/src/content/browser/browser_plugin/test_browser_plugin_guest_delegate.cc
index dc2db35..ec3c0d6 100644 (file)
--- a/src/content/browser/browser_plugin/test_browser_plugin_guest_delegate.cc
+++ b/src/content/browser/browser_plugin/test_browser_plugin_guest_delegate.cc
@@ -20,9 +20,9 @@ void TestBrowserPluginGuestDelegate::ResetStates() {
 
 void TestBrowserPluginGuestDelegate::AddMessageToConsole(
     int32 level,
-    const string16& message,
+    const base::string16& message,
     int32 line_no,
-    const string16& source_id) {
+    const base::string16& source_id) {
 }
 
 void TestBrowserPluginGuestDelegate::Close() {
@@ -50,15 +50,11 @@ void TestBrowserPluginGuestDelegate::RendererResponsive() {
 void TestBrowserPluginGuestDelegate::RendererUnresponsive() {
 }
 
-bool TestBrowserPluginGuestDelegate::RequestPermission(
+void TestBrowserPluginGuestDelegate::RequestPermission(
     BrowserPluginPermissionType permission_type,
     const base::DictionaryValue& request_info,
     const PermissionResponseCallback& callback,
     bool allowed_by_default) {
-  return BrowserPluginGuestDelegate::RequestPermission(permission_type,
-                                                       request_info,
-                                                       callback,
-                                                       allowed_by_default);
 }
 
 void TestBrowserPluginGuestDelegate::SizeChanged(const gfx::Size& old_size,