rebase fix for linux

Author: rogerwang

.DEPS.git

@@ -35,8 +35,8 @@ deps = {
         Var('git_url') + '/external/googlemock.git@6b1759c3816d574bddde3e1725c51a811c8870e7',
     'src/testing/gtest':
         Var('git_url') + '/external/googletest.git@a6772271f71672e889776bfe49ec4efd9da036df',
-    'src/third_party/WebKit':
-        Var('webkit_url') + Var('webkit_rev'),
+    #'src/third_party/WebKit':
+        #Var('webkit_url') + Var('webkit_rev'),
     'src/third_party/accessibility-developer-tools':
         Var('git_url') + '/external/accessibility-developer-tools.git@2e3c9c8e49277a0ca1eeba510271eb03f9486d8f',
     'src/third_party/angle_dx11':
@@ -135,8 +135,8 @@ deps = {
         Var('git_url') + '/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
     'src/tools/swarm_client':
         Var('git_url') + '/chromium/tools/swarm_client.git@51336a32732d4eea3f07e44e4a62c4d8103ef29f',
-    'src/v8':
-        Var('git_url') + '/external/v8.git@387c3b089100ae5db9136ef045e71086f007d907',
+    #'src/v8':
+    #    Var('git_url') + '/external/v8.git@387c3b089100ae5db9136ef045e71086f007d907',
 }
 
 deps_os = {

base/message_pump_uv.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/message_loop/message_pump.h"
-#include "base/time.h"
+#include "base/time/time.h"
 #include "base/base_export.h"
 #include "third_party/node/deps/uv/include/uv.h"
 

chrome/browser/printing/print_dialog_gtk.cc

@@ -406,7 +406,7 @@ void PrintDialogGtk::OnJobCompleted(GtkPrintJob* print_job, GError* error) {
     LOG(ERROR) << "Printing failed: " << error->message;
   if (print_job)
     g_object_unref(print_job);
-  base::FileUtilProxy::DeleteFile(
+  base::FileUtilProxy::Delete(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE).get(),
       path_to_pdf_,
       false,

content/browser/dom_storage/dom_storage_message_filter.cc

@@ -25,7 +25,6 @@
 #include "url/gurl.h"
 
 using base::WaitableEvent;
-using dom_storage::DomStorageTaskRunner;
 using WebKit::WebStorageArea;
 
 namespace content {

content/browser/web_contents/web_contents_impl.cc

@@ -1507,7 +1507,7 @@ void WebContentsImpl::CreateNewWindow(
     AddDestructionObserver(new_contents);
   }
   // Save window features
-  new_contents->window_features_ = params.window_features;
+  new_contents->window_features_ = params.features;
 
   if (delegate_) {
     delegate_->WebContentsCreated(

content/common/dom_storage/dom_storage_map.cc

@@ -27,7 +27,7 @@ size_t CountBytes(const DOMStorageValuesMap& values) {
 
 }  // namespace
 
-size_t DomStorageMap::quota_override_ = 0;
+size_t DOMStorageMap::quota_override_ = 0;
 
 DOMStorageMap::DOMStorageMap(size_t quota)
     : bytes_used_(0),

content/common/dom_storage/dom_storage_map.h

@@ -21,7 +21,7 @@ namespace content {
 class CONTENT_EXPORT DOMStorageMap
     : public base::RefCountedThreadSafe<DOMStorageMap> {
  public:
-  explicit DomStorageMap(size_t quota);
+  explicit DOMStorageMap(size_t quota);
   static void SetQuotaOverride(size_t quota) {quota_override_ = quota; }
 
   unsigned Length() const;

content/common/view_messages.h

@@ -150,27 +150,6 @@ IPC_STRUCT_TRAITS_BEGIN(WebKit::WebScreenInfo)
   IPC_STRUCT_TRAITS_MEMBER(availableRect)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebWindowFeatures)
-  IPC_STRUCT_TRAITS_MEMBER(x)
-  IPC_STRUCT_TRAITS_MEMBER(xSet)
-  IPC_STRUCT_TRAITS_MEMBER(y)
-  IPC_STRUCT_TRAITS_MEMBER(ySet)
-  IPC_STRUCT_TRAITS_MEMBER(width)
-  IPC_STRUCT_TRAITS_MEMBER(widthSet)
-  IPC_STRUCT_TRAITS_MEMBER(height)
-  IPC_STRUCT_TRAITS_MEMBER(heightSet)
-
-  IPC_STRUCT_TRAITS_MEMBER(menuBarVisible)
-  IPC_STRUCT_TRAITS_MEMBER(statusBarVisible)
-  IPC_STRUCT_TRAITS_MEMBER(toolBarVisible)
-  IPC_STRUCT_TRAITS_MEMBER(locationBarVisible)
-  IPC_STRUCT_TRAITS_MEMBER(scrollbarsVisible)
-  IPC_STRUCT_TRAITS_MEMBER(resizable)
-
-  IPC_STRUCT_TRAITS_MEMBER(fullscreen)
-  IPC_STRUCT_TRAITS_MEMBER(dialog)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(content::MenuItem)
   IPC_STRUCT_TRAITS_MEMBER(label)
   IPC_STRUCT_TRAITS_MEMBER(tool_tip)

content/renderer/dom_storage/dom_storage_dispatcher.cc

@@ -263,7 +263,7 @@ DomStorageDispatcher::~DomStorageDispatcher() {
   proxy_->Shutdown();
 }
 
-scoped_refptr<DomStorageCachedArea> DomStorageDispatcher::OpenCachedArea(
+scoped_refptr<DOMStorageCachedArea> DomStorageDispatcher::OpenCachedArea(
     int routing_id, int connection_id, int64 namespace_id, const GURL& origin) {
   RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_OpenStorageArea(

content/renderer/dom_storage/dom_storage_dispatcher.h

@@ -29,7 +29,7 @@ class DomStorageDispatcher {
   ~DomStorageDispatcher();
 
   // Each call to open should be balanced with a call to close.
-  scoped_refptr<DomStorageCachedArea> OpenCachedArea(int routing_id,
+  scoped_refptr<DOMStorageCachedArea> OpenCachedArea(int routing_id,
                                                      int connection_id,
                                                      int64 namespace_id,
                                                      const GURL& origin);