From a36f43d2980c5ee072426386e6e83d2a104ec514 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 20 Oct 2015 12:35:08 -0700
Subject: [PATCH] Bug 1174244 - Switch in-tree Adjust SDK to use ch.boye
 instead of org.apache.http. r=sebastian

---
 .../com/adjust/sdk/AdjustFactory.java          |  6 +++---
 .../com/adjust/sdk/AttributionHandler.java     |  6 +++---
 .../com/adjust/sdk/RequestHandler.java         | 18 +++++++++---------
 .../thirdparty/com/adjust/sdk/Util.java        | 12 ++++++------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java b/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java
index 1ad772b2437..802af6416f4 100644
--- a/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java
+++ b/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java
@@ -2,9 +2,9 @@ package com.adjust.sdk;
 
 import android.content.Context;
 
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.params.HttpParams;
+import ch.boye.httpclientandroidlib.client.HttpClient;
+import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
+import ch.boye.httpclientandroidlib.params.HttpParams;
 
 public class AdjustFactory {
     private static IPackageHandler packageHandler = null;
diff --git a/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java b/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java
index 2a2bef03d93..0d550a83a8e 100644
--- a/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java
+++ b/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java
@@ -2,9 +2,9 @@ package com.adjust.sdk;
 
 import android.net.Uri;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
+import ch.boye.httpclientandroidlib.HttpResponse;
+import ch.boye.httpclientandroidlib.client.HttpClient;
+import ch.boye.httpclientandroidlib.client.methods.HttpGet;
 import org.json.JSONObject;
 
 import java.net.URI;
diff --git a/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java b/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java
index 49a46c8de24..84d45d0ce67 100644
--- a/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java
+++ b/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java
@@ -14,15 +14,15 @@ import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.message.BasicNameValuePair;
+import ch.boye.httpclientandroidlib.HttpResponse;
+import ch.boye.httpclientandroidlib.NameValuePair;
+import ch.boye.httpclientandroidlib.client.ClientProtocolException;
+import ch.boye.httpclientandroidlib.client.HttpClient;
+import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity;
+import ch.boye.httpclientandroidlib.client.methods.HttpPost;
+import ch.boye.httpclientandroidlib.client.methods.HttpUriRequest;
+import ch.boye.httpclientandroidlib.client.utils.URLEncodedUtils;
+import ch.boye.httpclientandroidlib.message.BasicNameValuePair;
 import org.json.JSONObject;
 
 import java.io.IOException;
diff --git a/mobile/android/thirdparty/com/adjust/sdk/Util.java b/mobile/android/thirdparty/com/adjust/sdk/Util.java
index a893d09f984..84c47f87e7e 100644
--- a/mobile/android/thirdparty/com/adjust/sdk/Util.java
+++ b/mobile/android/thirdparty/com/adjust/sdk/Util.java
@@ -12,12 +12,12 @@ package com.adjust.sdk;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
+import ch.boye.httpclientandroidlib.HttpResponse;
+import ch.boye.httpclientandroidlib.HttpStatus;
+import ch.boye.httpclientandroidlib.client.HttpClient;
+import ch.boye.httpclientandroidlib.params.BasicHttpParams;
+import ch.boye.httpclientandroidlib.params.HttpConnectionParams;
+import ch.boye.httpclientandroidlib.params.HttpParams;
 import org.json.JSONException;
 import org.json.JSONObject;