Remove Finch support for PasswordBranding

chrome/browser/android/password_ui_view_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/password_ui_view_android.h"
 
 #include <algorithm>
 
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_piece.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/password_manager/core/browser/affiliation_utils.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"

[vasilii, 2016/12/16 16:56:53]

seems to be unused.

[vabr (Chromium), 2016/12/16 18:56:28]

Done.

 #include "components/password_manager/core/browser/password_manager_constants.h"
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "components/password_manager/core/common/experiments.h"

[vasilii, 2016/12/16 16:56:53]

unused, maybe other headers too.

[vabr (Chromium), 2016/12/16 18:56:27]

Indeed, the affiliation_utils seemed unused as well.
Done.

 #include "jni/PasswordUIView_jni.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
@@ skipping 109 matching lines @@
   password_manager_presenter_.RemovePasswordException(index);
 }
 
 ScopedJavaLocalRef<jstring> GetAccountDashboardURL(
     JNIEnv* env,
     const JavaParamRef<jclass>&) {
   return ConvertUTF8ToJavaString(
       env, password_manager::kPasswordManagerAccountDashboardURL);
 }
 
-static jboolean ShouldUseSmartLockBranding(JNIEnv* env,
-                                           const JavaParamRef<jclass>&) {
-  const browser_sync::ProfileSyncService* sync_service =
-      ProfileSyncServiceFactory::GetForProfile(
-          ProfileManager::GetLastUsedProfile());
-  return password_bubble_experiment::IsSmartLockBrandingEnabled(sync_service);
-}
-
 // static
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj);
   return reinterpret_cast<intptr_t>(controller);
 }
 
 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }