Merge "Fix style in WebCore/platform/network/android"

2 files changed, 5 insertions, 10 deletions

diff --git a/WebCore/platform/network/android/ProxyServerAndroid.cpp b/WebCore/platform/network/android/ProxyServerAndroid.cpp
index a57b8d0..2f813b5 100644
--- a/WebCore/platform/network/android/ProxyServerAndroid.cpp
+++ b/WebCore/platform/network/android/ProxyServerAndroid.cpp
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "ProxyServer.h"
 
-#include "KURL.h"
-#include "NetworkingContext.h"
 #include "NotImplemented.h"
 
 namespace WebCore {
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
index 412efda..8837cf8 100644
--- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-
 #include "ResourceHandle.h"
 
 #include "CachedResourceLoader.h"
@@ -52,13 +51,11 @@ ResourceHandle::~ResourceHandle()
 bool ResourceHandle::start(NetworkingContext* context)
 {
     MainResourceLoader* mainLoader = context->mainResourceLoader();
-    bool isMainResource =
-            static_cast<void*>(mainLoader) == static_cast<void*>(client());
-
-    PassRefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_firstRequest, context->frameLoaderClient(), isMainResource, false);
+    bool isMainResource = static_cast<void*>(mainLoader) == static_cast<void*>(client());
+    RefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_firstRequest, context->frameLoaderClient(), isMainResource, false);
 
     if (loader) {
-        d->m_loader = loader;
+        d->m_loader = loader.release();
         return true;
     }
 
@@ -111,11 +108,11 @@ bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*)
     return ResourceLoaderAndroid::willLoadFromCache(request.url(), formData ? formData->identifier() : 0);
 }
 
-bool ResourceHandle::loadsBlocked() 
+bool ResourceHandle::loadsBlocked()
 {
     // FIXME, need to check whether connection pipe is blocked.
     // return false for now
-    return false; 
+    return false;
 }
 
 // Class to handle synchronized loading of resources.