Update Clang libcc patch after updating Chromium.

- googleurl headers are now in url/.
- dom_storage_namespace.h moved.

Change-Id: I87f08d2426ac0da5b50fcf424ca446fb03f207fd
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

1 files changed, 38 insertions, 39 deletions

diff --git a/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch b/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch
index a2a5a2acf..9bd5ef0dd 100644
--- a/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch
+++ b/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch
@@ -1,8 +1,9 @@
-From 5a81cf6d0797c855a15eef8faa00bb221f24ca8f Mon Sep 17 00:00:00 2001
+From f888ffe0c6d43b1fda162a4a33a84377c583f2d3 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Thu, 27 Jun 2013 15:58:32 +0200
 Subject: [PATCH] Clang / libc++ does not support incomplete types in
- templates. See: http://clang.llvm.org/compatibility.html#undep_incomplete
+ templates. See:
+ http://clang.llvm.org/compatibility.html#undep_incomplete
 
 Therefore forward declarations must be removed in several places:
 - AudioBus::QueuedAudioBuffer
@@ -25,6 +26,7 @@ Therefore forward declarations must be removed in several places:
  base/callback_forward.h                            |   9 +-
  .../browser/devtools/worker_devtools_manager.cc    |  24 ----
  content/browser/devtools/worker_devtools_manager.h |  26 +++-
+ .../browser/dom_storage/dom_storage_namespace.h    |   3 +-
  .../indexed_db/indexed_db_dispatcher_host.h        |   2 +-
  .../media/media_stream_dispatcher_host.cc          |  11 --
  .../media/media_stream_dispatcher_host.h           |  12 +-
@@ -46,10 +48,9 @@ Therefore forward declarations must be removed in several places:
  net/dns/mock_host_resolver.h                       |  32 ++++-
  net/http/http_auth_cache.h                         | 144 ++++++++++-----------
  ui/gfx/image/image_family.h                        |  23 ++--
- webkit/browser/dom_storage/dom_storage_namespace.h |   3 +-
  webkit/support/weburl_loader_mock_factory.cc       |   5 -
  webkit/support/weburl_loader_mock_factory.h        |   8 +-
- 31 files changed, 246 insertions(+), 258 deletions(-)
+ 27 files changed, 240 insertions(+), 255 deletions(-)
 
 diff --git a/base/callback_forward.h b/base/callback_forward.h
 index 7983248..8538bb2 100644
@@ -156,22 +157,36 @@ index 7ea8840..0f0111e 100644
    typedef std::list<TerminatedInspectedWorker> TerminatedInspectedWorkers;
    // List of terminated workers for which there may be a devtools client on
    // the UI thread. Worker entry is added into this list when inspected worker
+diff --git a/content/browser/dom_storage/dom_storage_namespace.h b/content/browser/dom_storage/dom_storage_namespace.h
+index f33042f..5860685 100644
+--- a/content/browser/dom_storage/dom_storage_namespace.h
++++ b/content/browser/dom_storage/dom_storage_namespace.h
+@@ -11,8 +11,7 @@
+ #include "base/files/file_path.h"
+ #include "base/memory/ref_counted.h"
+ #include "content/common/content_export.h"
+-
+-class GURL;
++#include "url/gurl.h"
+ 
+ namespace content {
+ 
 diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.h b/content/browser/indexed_db/indexed_db_dispatcher_host.h
-index 0731113..773d6e4 100644
+index 0731113..e254cad 100644
 --- a/content/browser/indexed_db/indexed_db_dispatcher_host.h
 +++ b/content/browser/indexed_db/indexed_db_dispatcher_host.h
 @@ -12,8 +12,8 @@
  #include "base/id_map.h"
  #include "base/memory/ref_counted.h"
  #include "content/public/browser/browser_message_filter.h"
-+#include "googleurl/src/gurl.h"
++#include "url/gurl.h"
  
 -class GURL;
  struct IndexedDBDatabaseMetadata;
  struct IndexedDBHostMsg_DatabaseCount_Params;
  struct IndexedDBHostMsg_DatabaseCreateIndex_Params;
 diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
-index abd4cd3..2d65d16 100644
+index ebc4d89..9135b71 100644
 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
 +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
 @@ -12,17 +12,6 @@
@@ -193,10 +208,10 @@ index abd4cd3..2d65d16 100644
      int render_process_id,
      MediaStreamManager* media_stream_manager)
 diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
-index 4b94496..0ea2f3f 100644
+index ec1dd15..cfc6913 100644
 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h
 +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
-@@ -71,7 +71,17 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
+@@ -72,7 +72,17 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
    int render_process_id_;
    MediaStreamManager* media_stream_manager_;
  
@@ -216,18 +231,18 @@ index 4b94496..0ea2f3f 100644
    // Streams generated for this host.
    StreamMap streams_;
 diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
-index 8019d3e..46d89d3 100644
+index 9723634..c46ab13 100644
 --- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
 +++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
-@@ -13,6 +13,7 @@
- #include "base/files/file_path.h"
+@@ -15,6 +15,7 @@
  #include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h"
+ #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
  #include "content/common/content_export.h"
 +#include "content/common/pepper_renderer_instance_data.h"
  #include "content/public/browser/browser_ppapi_host.h"
  #include "content/public/common/process_type.h"
  #include "ipc/ipc_channel_proxy.h"
-@@ -20,8 +21,6 @@
+@@ -22,8 +23,6 @@
  
  namespace content {
  
@@ -290,10 +305,10 @@ index b85e76b..e6bf717 100644
    MessagePorts message_ports_;
  
 diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
-index 92b73a9..1258195 100644
+index 49493d9..35c4635 100644
 --- a/content/common/gpu/gpu_messages.h
 +++ b/content/common/gpu/gpu_messages.h
-@@ -110,10 +110,12 @@ IPC_STRUCT_BEGIN(GpuStreamTextureMsg_MatrixChanged_Params)
+@@ -112,10 +112,12 @@ IPC_STRUCT_BEGIN(GpuStreamTextureMsg_MatrixChanged_Params)
  IPC_STRUCT_END()
  #endif
  
@@ -308,7 +323,7 @@ index 92b73a9..1258195 100644
  IPC_STRUCT_TRAITS_BEGIN(gpu::GpuPerformanceStats)
    IPC_STRUCT_TRAITS_MEMBER(graphics)
 diff --git a/content/public/test/test_file_error_injector.h b/content/public/test/test_file_error_injector.h
-index c056780..23a5520 100644
+index c056780..306c7e2 100644
 --- a/content/public/test/test_file_error_injector.h
 +++ b/content/public/test/test_file_error_injector.h
 @@ -13,8 +13,7 @@
@@ -317,7 +332,7 @@ index c056780..23a5520 100644
  #include "content/public/browser/download_interrupt_reasons.h"
 -
 -class GURL;
-+#include "googleurl/src/gurl.h"
++#include "url/gurl.h"
  
  namespace content {
  
@@ -334,7 +349,7 @@ index 642cda5..83a55f6 100644
  namespace WebKit {
  class WebMediaStreamCenterClient;
 diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
-index 80b3473..91e1731 100644
+index cc241fa..57d65b6 100644
 --- a/content/renderer/media/media_stream_dispatcher.cc
 +++ b/content/renderer/media/media_stream_dispatcher.cc
 @@ -14,37 +14,6 @@
@@ -376,7 +391,7 @@ index 80b3473..91e1731 100644
      const base::WeakPtr<MediaStreamDispatcherEventHandler>& handler,
      int request_id)
 diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h
-index 3562a02..3e66252 100644
+index aa8f345..af25963 100644
 --- a/content/renderer/media/media_stream_dispatcher.h
 +++ b/content/renderer/media/media_stream_dispatcher.h
 @@ -98,11 +98,38 @@ class CONTENT_EXPORT MediaStreamDispatcher
@@ -460,7 +475,7 @@ index 33d29b3..45ffa65 100644
 +
  #endif  // GPU_CONFIG_DX_DIAG_NODE_H_
 diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
-index 3d68b79..366ace0 100644
+index 34fc793..53dec64 100644
 --- a/media/filters/ffmpeg_audio_decoder.cc
 +++ b/media/filters/ffmpeg_audio_decoder.cc
 @@ -22,12 +22,6 @@
@@ -477,7 +492,7 @@ index 3d68b79..366ace0 100644
  static inline bool IsEndOfStream(int result,
                                   int decoded_size,
 diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
-index 5181796..4b64525 100644
+index 7ea8615..44c9830 100644
 --- a/media/filters/ffmpeg_audio_decoder.h
 +++ b/media/filters/ffmpeg_audio_decoder.h
 @@ -25,7 +25,13 @@ namespace media {
@@ -844,22 +859,6 @@ index b2a2c07..902dede 100644
    // Find the closest aspect ratio in the map to |desired_aspect|.
    // Ties are broken by the thinner aspect.
    // |map_| must not be empty. |desired_aspect| must be > 0.0.
-diff --git a/webkit/browser/dom_storage/dom_storage_namespace.h b/webkit/browser/dom_storage/dom_storage_namespace.h
-index 758ca2e..10d6662 100644
---- a/webkit/browser/dom_storage/dom_storage_namespace.h
-+++ b/webkit/browser/dom_storage/dom_storage_namespace.h
-@@ -10,10 +10,9 @@
- #include "base/basictypes.h"
- #include "base/files/file_path.h"
- #include "base/memory/ref_counted.h"
-+#include "googleurl/src/gurl.h"
- #include "webkit/browser/webkit_storage_browser_export.h"
- 
--class GURL;
--
- namespace dom_storage {
- 
- class DomStorageArea;
 diff --git a/webkit/support/weburl_loader_mock_factory.cc b/webkit/support/weburl_loader_mock_factory.cc
 index f18bc07..f459211 100644
 --- a/webkit/support/weburl_loader_mock_factory.cc
@@ -877,7 +876,7 @@ index f18bc07..f459211 100644
  
  WebURLLoaderMockFactory::~WebURLLoaderMockFactory() {}
 diff --git a/webkit/support/weburl_loader_mock_factory.h b/webkit/support/weburl_loader_mock_factory.h
-index 97ea5c8..2a18af3 100644
+index 78abd96..8f00fc0 100644
 --- a/webkit/support/weburl_loader_mock_factory.h
 +++ b/webkit/support/weburl_loader_mock_factory.h
 @@ -9,12 +9,12 @@
@@ -908,5 +907,5 @@ index 97ea5c8..2a18af3 100644
    // Loads the specified request and populates the response, error and data
    // accordingly.
 -- 
-1.8.0.1
+1.7.12.4 (Apple Git-37)