| Index: chrome/browser/sync/profile_sync_service_android.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
|
| index be0cb5f40c3930a15837d6c774ecd8da5ec1b0af..4e9e6348ffc259d3eb3445e09f827e3b8ccfbf12 100644
|
| --- a/chrome/browser/sync/profile_sync_service_android.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_android.cc
|
| @@ -12,7 +12,6 @@
|
| #include "base/json/json_writer.h"
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/metrics/field_trial.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/time/time.h"
|
| @@ -114,10 +113,6 @@ void ProfileSyncServiceAndroid::OnStateChanged() {
|
|
|
| jboolean ProfileSyncServiceAndroid::IsPassphrasePrompted(JNIEnv* env,
|
| jobject obj) {
|
| - const std::string group_name =
|
| - base::FieldTrialList::FindFullName("LimitSyncPassphrasePrompt");
|
| - if (group_name != "Enabled")
|
| - return false;
|
| return sync_prefs_->IsPassphrasePrompted();
|
| }
|
|
|
|
|