diff options
author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
commit | 0529e5d033099cbfc42635f6f6183833b09dff6e (patch) | |
tree | badea60062e611382d8a37e3b0bfda8d69760c2b /chrome/browser/signin/android_profile_oauth2_token_service.h | |
parent | 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca (diff) | |
download | chromium_org-0529e5d033099cbfc42635f6f6183833b09dff6e.tar.gz |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
Diffstat (limited to 'chrome/browser/signin/android_profile_oauth2_token_service.h')
-rw-r--r-- | chrome/browser/signin/android_profile_oauth2_token_service.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.h b/chrome/browser/signin/android_profile_oauth2_token_service.h index 7d6a660299..a641e3e682 100644 --- a/chrome/browser/signin/android_profile_oauth2_token_service.h +++ b/chrome/browser/signin/android_profile_oauth2_token_service.h @@ -8,7 +8,7 @@ #include <jni.h> #include <string> -#include "base/android/jni_helper.h" +#include "base/android/jni_weak_ref.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" |