Cleanup after chromium update.

- Implement recently added pure virtual members:
  BrowserContextQt::GetPath() const
  BrowserContextQt::RequestMIDISysExPermission(...)
- Remove obsolete function GetSpeechRecognitionPreferences.
- Rename usage of GetActiveURL() to GetVisibleURL().
- Update namespace for usage of type WebPluginGeometry.
- Adjust parameters of RenderWidgetHostViewQt::TextInputChanged.
- Rename RenderWidgetHostViewQt::RenderViewGone to RenderProcessGone
- set_http_server_properties now takes a scoped_ptr.
- Rename WebDropData to content::DropData.
- Rename WebMenuItem to content::MenuItem.
- webkit/support/webkit_support.gyp has been moved to
  webkit/webkit_resources.gyp.

Change-Id: I6d5d281b797a8f6197ecb53a08798bd1f6845754
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

7 files changed, 24 insertions, 13 deletions

diff --git a/lib/browser_context_qt.h b/lib/browser_context_qt.h
index 33e236044..5b83a4367 100644
--- a/lib/browser_context_qt.h
+++ b/lib/browser_context_qt.h
@@ -46,7 +46,7 @@
 
 #include "base/files/scoped_temp_dir.h"
 
-#include "base/time.h"
+#include "base/time/time.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/storage_partition.h"
@@ -79,6 +79,12 @@ public:
        return false;
    }
 
+   virtual base::FilePath GetPath() const
+   {
+       // FIXME: return the path of the directory where this context's data is stored.
+       return base::FilePath();
+   }
+
    virtual net::URLRequestContextGetter* GetRequestContext()
    {
        return GetDefaultStoragePartition(this)->GetURLRequestContext();
@@ -88,6 +94,12 @@ public:
    virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(int) { return GetRequestContext(); }
    virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(const base::FilePath&, bool) { return GetRequestContext(); }
 
+   virtual void RequestMIDISysExPermission(int render_process_id, int render_view_id, const GURL& requesting_frame, const MIDISysExPermissionCallback& callback)
+   {
+       // Always reject requests for testing.
+       callback.Run(false);
+   }
+
    virtual content::ResourceContext* GetResourceContext()
    {
        return resourceContext.get();
@@ -95,7 +107,6 @@ public:
 
    virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() { return 0; }
    virtual content::GeolocationPermissionContext* GetGeolocationPermissionContext() { return 0; }
-   virtual content::SpeechRecognitionPreferences* GetSpeechRecognitionPreferences() { return 0; }
    virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() { return 0; }
 
    net::URLRequestContextGetter *CreateRequestContext(content::ProtocolHandlerMap* protocol_handlers)
diff --git a/lib/qquickwebcontentsview.cpp b/lib/qquickwebcontentsview.cpp
index 64dfdafb0..5a56ecdda 100644
--- a/lib/qquickwebcontentsview.cpp
+++ b/lib/qquickwebcontentsview.cpp
@@ -76,7 +76,7 @@ QQuickWebContentsView::~QQuickWebContentsView()
 QUrl QQuickWebContentsView::url() const
 {
     Q_D(const QQuickWebContentsView);
-    GURL gurl = d->webContentsDelegate->web_contents()->GetActiveURL();
+    GURL gurl = d->webContentsDelegate->web_contents()->GetVisibleURL();
     return QUrl(QString::fromStdString(gurl.spec()));
 }
 
diff --git a/lib/render_widget_host_view_qt.cpp b/lib/render_widget_host_view_qt.cpp
index f6f15e0ac..276ae9b4d 100644
--- a/lib/render_widget_host_view_qt.cpp
+++ b/lib/render_widget_host_view_qt.cpp
@@ -271,7 +271,7 @@ void RenderWidgetHostViewQt::WasHidden()
     m_host->WasHidden();
 }
 
-void RenderWidgetHostViewQt::MovePluginWindows(const gfx::Vector2d&, const std::vector<webkit::npapi::WebPluginGeometry>&)
+void RenderWidgetHostViewQt::MovePluginWindows(const gfx::Vector2d&, const std::vector<content::WebPluginGeometry>&)
 {
     QT_NOT_YET_IMPLEMENTED
 }
@@ -291,7 +291,7 @@ void RenderWidgetHostViewQt::SetIsLoading(bool)
     // We use WebContentsDelegateQt::LoadingStateChanged to notify about loading state.
 }
 
-void RenderWidgetHostViewQt::TextInputTypeChanged(ui::TextInputType, bool)
+void RenderWidgetHostViewQt::TextInputTypeChanged(ui::TextInputType, bool, ui::TextInputMode)
 {
     QT_NOT_YET_IMPLEMENTED
 }
@@ -322,7 +322,7 @@ void RenderWidgetHostViewQt::DidUpdateBackingStore(const gfx::Rect& scroll_rect,
     }
 }
 
-void RenderWidgetHostViewQt::RenderViewGone(base::TerminationStatus, int)
+void RenderWidgetHostViewQt::RenderProcessGone(base::TerminationStatus, int)
 {
     Destroy();
 }
diff --git a/lib/render_widget_host_view_qt.h b/lib/render_widget_host_view_qt.h
index 4b1a3c66e..2ae735053 100644
--- a/lib/render_widget_host_view_qt.h
+++ b/lib/render_widget_host_view_qt.h
@@ -100,15 +100,15 @@ public:
 #endif  // defined(TOOLKIT_GTK)
     virtual void WasShown();
     virtual void WasHidden();
-    virtual void MovePluginWindows(const gfx::Vector2d&, const std::vector<webkit::npapi::WebPluginGeometry>&);
+    virtual void MovePluginWindows(const gfx::Vector2d&, const std::vector<content::WebPluginGeometry>&);
     virtual void Blur();
     virtual void UpdateCursor(const WebCursor&);
     virtual void SetIsLoading(bool);
-    virtual void TextInputTypeChanged(ui::TextInputType, bool);
+    virtual void TextInputTypeChanged(ui::TextInputType, bool, ui::TextInputMode);
     virtual void ImeCancelComposition();
     virtual void ImeCompositionRangeChanged(const ui::Range&, const std::vector<gfx::Rect>&);
     virtual void DidUpdateBackingStore(const gfx::Rect& scroll_rect, const gfx::Vector2d& scroll_delta, const std::vector<gfx::Rect>& copy_rects, const ui::LatencyInfo&);
-    virtual void RenderViewGone(base::TerminationStatus, int);
+    virtual void RenderProcessGone(base::TerminationStatus, int);
     virtual void Destroy();
     virtual void SetTooltipText(const string16&);
     virtual void SelectionBoundsChanged(const ViewHostMsg_SelectionBounds_Params&);
diff --git a/lib/url_request_context_getter_qt.cpp b/lib/url_request_context_getter_qt.cpp
index 18a8b0082..f12eb6305 100644
--- a/lib/url_request_context_getter_qt.cpp
+++ b/lib/url_request_context_getter_qt.cpp
@@ -108,7 +108,7 @@ net::URLRequestContext *URLRequestContextGetterQt::GetURLRequestContext()
 
         m_storage->set_http_auth_handler_factory(
             net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
-        m_storage->set_http_server_properties(new net::HttpServerPropertiesImpl);
+        m_storage->set_http_server_properties(scoped_ptr<net::HttpServerProperties>(new net::HttpServerPropertiesImpl));
 
         base::FilePath cache_path = m_basePath.Append(FILE_PATH_LITERAL("Cache"));
         net::HttpCache::DefaultBackend* main_backend =
diff --git a/lib/web_contents_delegate_qt.cpp b/lib/web_contents_delegate_qt.cpp
index 22725bdc7..5b6c39fb5 100644
--- a/lib/web_contents_delegate_qt.cpp
+++ b/lib/web_contents_delegate_qt.cpp
@@ -82,7 +82,7 @@ WebContentsDelegateQt::WebContentsDelegateQt(content::BrowserContext* browser_co
 void WebContentsDelegateQt::NavigationStateChanged(const content::WebContents* source, unsigned changed_flags)
 {
     if (changed_flags & content::INVALIDATE_TYPE_URL) {
-        GURL gurl = web_contents()->GetActiveURL();
+        GURL gurl = web_contents()->GetVisibleURL();
         QUrl url(QString::fromStdString(gurl.spec()));
         Q_EMIT urlChanged(url);
     }
diff --git a/lib/web_contents_view_qt.h b/lib/web_contents_view_qt.h
index 456329201..c7853adda 100644
--- a/lib/web_contents_view_qt.h
+++ b/lib/web_contents_view_qt.h
@@ -107,12 +107,12 @@ public:
 
     virtual void RestoreFocus() { QT_NOT_USED }
 
-    virtual WebDropData* GetDropData() const { QT_NOT_YET_IMPLEMENTED return 0; }
+    virtual content::DropData* GetDropData() const { QT_NOT_YET_IMPLEMENTED return 0; }
 
     virtual gfx::Rect GetViewBounds() const { QT_NOT_YET_IMPLEMENTED return gfx::Rect(); }
 
     virtual void ShowPopupMenu(const gfx::Rect& bounds, int item_height, double item_font_size, int selected_item,
-                                const std::vector<WebMenuItem>& items, bool right_aligned, bool allow_multiple_selection) { QT_NOT_YET_IMPLEMENTED }
+                                const std::vector<content::MenuItem>& items, bool right_aligned, bool allow_multiple_selection) { QT_NOT_YET_IMPLEMENTED }
 
 #if defined(OS_MACOSX)
     virtual void SetAllowOverlappingViews(bool overlapping) { QT_NOT_YET_IMPLEMENTED }