Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1031)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java

Issue 2721083002: Move PwsClientImplTest to junit (Closed)
Patch Set: Update commit message Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
index 86cb7c43a271e42fa198afd2d116d7c5d678c0b0..fe2cb024d5b773f9bdfe0affc45dadc460b29dbb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java
@@ -14,6 +14,7 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.chromium.base.ContextUtils;
import org.chromium.base.LocaleUtils;
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
@@ -56,13 +57,7 @@ class PwsClientImpl implements PwsClient {
// Cached locale string. When the default locale changes, recreate the Accept-Language header.
private static String sDefaultLocale;
- // The context must be valid for as long as this client is in use, since it is used to recreate
- // the Accept-Language header when the locale changes.
- private final Context mContext;
-
- public PwsClientImpl(Context context) {
- mContext = context;
- }
+ public PwsClientImpl() {}
private String getApiKey() {
if (ChromeVersionInfo.isStableBuild()) {
@@ -231,7 +226,8 @@ class PwsClientImpl implements PwsClient {
String updateAcceptLanguage() {
String localeString = LocaleUtils.getDefaultLocaleListString();
if (sDefaultLocale == null || !sDefaultLocale.equals(localeString)) {
- String acceptLanguages = mContext.getResources().getString(R.string.accept_languages);
+ Context context = ContextUtils.getApplicationContext();
+ String acceptLanguages = context.getResources().getString(R.string.accept_languages);
acceptLanguages = prependToAcceptLanguagesIfNecessary(localeString, acceptLanguages);
sAcceptLanguage = generateAcceptLanguageHeader(acceptLanguages);
sDefaultLocale = localeString;
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698