From e4a6ca290c7810f10ff4fc136a07db2149422492 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Tue, 7 Jun 2011 16:19:58 +0100
Subject: Merge Chromium at r11.0.672.0: Compile fixes

WebRequestContext.h:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924

Other files:
base/lock.h moved to base/synchronization/lock.h contents
to base namespace:
http://codereview.chromium.org/6018013

Change-Id: Icf028ea9cd32746c6681751bc86935aefb7c0084
---
 Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h     | 2 +-
 Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp       | 4 ++--
 Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp       | 4 ++--
 Source/WebKit/android/WebCoreSupport/WebRequestContext.h    | 2 +-
 Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp | 3 +++
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
index e467218..83eb5fb 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
+++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
@@ -47,7 +47,7 @@
 
 #include <android/net/android_network_library_impl.h>
 #include <base/callback.h>
-#include <base/lock.h>
+#include <base/synchronization/lock.h>
 #include <base/message_loop_proxy.h>
 #include <base/ref_counted.h>
 #include <base/string_util.h>
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
index 1872fb9..2bb4d3d 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
+++ b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
@@ -60,8 +60,8 @@ namespace {
 
 void initChromium()
 {
-    static Lock lock;
-    AutoLock aLock(lock);
+    static base::Lock lock;
+    base::AutoLock aLock(lock);
     static bool initCalled = false;
     if (!initCalled) {
         logging::SetLogMessageHandler(logMessageHandler);
diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
index 429e990..dfb249d 100644
--- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
@@ -207,7 +207,7 @@ public:
 
     // Block until the given number of callbacks has been made.
     void Wait(int numCallbacks) {
-        AutoLock al(m_lock);
+        base::AutoLock al(m_lock);
         int lastCount = m_count;
         while (m_count < numCallbacks) {
             // TODO(husky): Maybe use TimedWait() here? But it's not obvious what
@@ -223,7 +223,7 @@ private:
     friend class base::RefCounted<FlushSemaphore>;
 
     void Callback() {
-        AutoLock al(m_lock);
+        base::AutoLock al(m_lock);
         m_count++;
         m_condition.Broadcast();
     }
diff --git a/Source/WebKit/android/WebCoreSupport/WebRequestContext.h b/Source/WebKit/android/WebCoreSupport/WebRequestContext.h
index 51f0514..9286127 100644
--- a/Source/WebKit/android/WebCoreSupport/WebRequestContext.h
+++ b/Source/WebKit/android/WebCoreSupport/WebRequestContext.h
@@ -34,7 +34,7 @@
 namespace android {
 
 // This class is generally not threadsafe.
-class WebRequestContext : public URLRequestContext {
+class WebRequestContext : public net::URLRequestContext {
 public:
     // URLRequestContext overrides.
     virtual const std::string& GetUserAgent(const GURL&) const;
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
index b22ae26..edaf6c5 100644
--- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
@@ -39,6 +39,9 @@
 
 #include <wtf/text/CString.h>
 
+using base::Lock;
+using base::AutoLock;
+
 namespace android {
 
 base::Thread* WebUrlLoaderClient::ioThread()
-- 
cgit v1.1