Adjustments after upgrading to Chromium 54

brightray/brightray.gyp

@@ -185,6 +185,8 @@
                   '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
                   '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
                   '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+                  # device/gamepad/BUILD.gn:
+                  '$(SDKROOT)/System/Library/Frameworks/GameController.framework',
                   # content_browser.gypi:
                   '-lbsm',
                   # content_common.gypi:
@@ -203,6 +205,7 @@
                 'libraries': [
                   # Needed by desktop_capture.lib:
                   '-ld3d11.lib',
+                  '-ldxgi.lib',
                   # Following libs are always linked statically.
                   '<(libchromiumcontent_dir)/base_static.lib',
                   '<(libchromiumcontent_dir)/sandbox.lib',
@@ -235,6 +238,7 @@
                   '<(libchromiumcontent_dir)/fxcrt.lib',
                   '<(libchromiumcontent_dir)/fxedit.lib',
                   '<(libchromiumcontent_dir)/fxge.lib',
+                  '<(libchromiumcontent_dir)/fxjs.lib',
                   '<(libchromiumcontent_dir)/javascript.lib',
                   '<(libchromiumcontent_dir)/pdfwindow.lib',
                   '<(libchromiumcontent_dir)/fx_agg.lib',
@@ -256,6 +260,7 @@
                   # content_common.gypi:
                   '-ld3d9.lib',
                   '-ld3d11.lib',
+                  '-ldxgi.lib',
                   '-ldxva2.lib',
                   '-lstrmiids.lib',
                   '-lmf.lib',
@@ -295,6 +300,8 @@
                       'secur32.lib',
                       'urlmon.lib',
                       'winhttp.lib',
+                      # ui/gfx/BUILD.gn:
+                      'dwrite.lib',
                     ],
                     'DelayLoadDLLs': [
                       'wtsapi32.dll',

brightray/browser/devtools_file_system_indexer.cc

@@ -267,8 +267,8 @@ DevToolsFileSystemIndexer::FileSystemIndexingJob::FileSystemIndexingJob(
       total_work_callback_(total_work_callback),
       worked_callback_(worked_callback),
       done_callback_(done_callback),
-      current_file_(BrowserThread::GetMessageLoopProxyForThread(
-                        BrowserThread::FILE).get()),
+      current_file_(
+          BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE).get()),
       files_indexed_(0),
       stopped_(false) {
   current_trigrams_set_.resize(kTrigramCount);

brightray/browser/devtools_manager_delegate.cc

@@ -18,7 +18,6 @@
 #include "components/devtools_discovery/basic_target_descriptor.h"
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 #include "components/devtools_http_handler/devtools_http_handler.h"
-#include "content/grit/shell_resources.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/favicon_status.h"
@@ -26,6 +25,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
+#include "content/shell/grit/shell_resources.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"
 #include "net/socket/stream_socket.h"

brightray/browser/inspectable_web_contents.h

@@ -44,6 +44,7 @@ class InspectableWebContents {
                                   const base::Value* arg1 = nullptr,
                                   const base::Value* arg2 = nullptr,
                                   const base::Value* arg3 = nullptr) = 0;
+  virtual void InspectElement(int x, int y) = 0;
 };
 
 }  // namespace brightray

brightray/browser/inspectable_web_contents_impl.cc

@@ -249,6 +249,11 @@ content::WebContents* InspectableWebContentsImpl::GetDevToolsWebContents() const
   return devtools_web_contents_.get();
 }
 
+void InspectableWebContentsImpl::InspectElement(int x, int y) {
+  if (agent_host_.get())
+    agent_host_->InspectElement(this, x, y);
+}
+
 void InspectableWebContentsImpl::SetDelegate(InspectableWebContentsDelegate* delegate) {
   delegate_ = delegate;
 }

brightray/browser/inspectable_web_contents_impl.h

@@ -60,6 +60,7 @@ class InspectableWebContentsImpl :
                           const base::Value* arg1,
                           const base::Value* arg2,
                           const base::Value* arg3) override;
+  void InspectElement(int x, int y) override;
 
   // Return the last position and size of devtools window.
   gfx::Rect GetDevToolsBounds() const;

brightray/browser/net/devtools_network_upload_data_stream.cc

@@ -35,11 +35,11 @@ bool DevToolsNetworkUploadDataStream::IsInMemory() const {
   return false;
 }
 
-int DevToolsNetworkUploadDataStream::InitInternal() {
+int DevToolsNetworkUploadDataStream::InitInternal(const net::BoundNetLog& net_log) {
   throttled_byte_count_ = 0;
   int result = upload_data_stream_->Init(
       base::Bind(&DevToolsNetworkUploadDataStream::StreamInitCallback,
-                 base::Unretained(this)));
+                 base::Unretained(this)), net_log);
   if (result == net::OK && !is_chunked())
     SetSize(upload_data_stream_->size());
   return result;

brightray/browser/net/devtools_network_upload_data_stream.h

@@ -27,7 +27,7 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream {
  private:
   // net::UploadDataStream implementation.
   bool IsInMemory() const override;
-  int InitInternal() override;
+  int InitInternal(const net::BoundNetLog& net_log) override;
   int ReadInternal(net::IOBuffer* buf, int buf_len) override;
   void ResetInternal() override;
 

brightray/browser/permission_manager.cc

@@ -22,6 +22,7 @@ int PermissionManager::RequestPermission(
     content::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
+    bool user_gesture,
     const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
   if (permission == content::PermissionType::MIDI_SYSEX) {
     content::ChildProcessSecurityPolicy::GetInstance()->
@@ -35,6 +36,7 @@ int PermissionManager::RequestPermissions(
     const std::vector<content::PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
+    bool user_gesture,
     const base::Callback<void(
         const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
   std::vector<blink::mojom::PermissionStatus> permissionStatuses;

brightray/browser/permission_manager.h

@@ -21,11 +21,13 @@ class PermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
+      bool user_gesture,
       const base::Callback<void(blink::mojom::PermissionStatus)>& callback) override;
   int RequestPermissions(
       const std::vector<content::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
+      bool user_gesture,
       const base::Callback<void(
           const std::vector<blink::mojom::PermissionStatus>&)>& callback) override;
   void CancelPermissionRequest(int request_id) override;

brightray/browser/platform_notification_service.cc

@@ -86,6 +86,7 @@ void PlatformNotificationService::DisplayNotification(
 void PlatformNotificationService::DisplayPersistentNotification(
     content::BrowserContext* browser_context,
     int64_t persistent_notification_id,
+    const GURL& service_worker_origin,
     const GURL& origin,
     const content::PlatformNotificationData& notification_data,
     const content::NotificationResources& notification_resources) {

brightray/browser/platform_notification_service.h

@@ -37,6 +37,7 @@ class PlatformNotificationService
   void DisplayPersistentNotification(
       content::BrowserContext* browser_context,
       int64_t persistent_notification_id,
+      const GURL& service_worker_origin,
       const GURL& origin,
       const content::PlatformNotificationData& notification_data,
       const content::NotificationResources& notification_resources) override;

brightray/browser/url_request_context_getter.cc

@@ -96,7 +96,7 @@ URLRequestContextGetter::Delegate::CreateHttpCacheBackendFactory(const base::Fil
       net::CACHE_BACKEND_DEFAULT,
       cache_path,
       0,
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::CACHE));
 }
 
 std::unique_ptr<net::CertVerifier>
@@ -291,10 +291,8 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     network_session_params.ignore_certificate_errors = false;
 
     // --disable-http2
-    if (command_line.HasSwitch(switches::kDisableHttp2)) {
-      network_session_params.enable_spdy31 = false;
+    if (command_line.HasSwitch(switches::kDisableHttp2))
       network_session_params.enable_http2 = false;
-    }
 
     // --ignore-certificate-errors
     if (command_line.HasSwitch(switches::kIgnoreCertificateErrors))
@@ -357,7 +355,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
 }
 
 scoped_refptr<base::SingleThreadTaskRunner> URLRequestContextGetter::GetNetworkTaskRunner() const {
-  return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
 }
 
 }  // namespace brightray