Disable manual password generation in some cases

This CL disables manual password generation in the context menu in case the
user has disabled the password manager or the site has an SSL problem (in which
case Chrome would not fill the credential).

Bug: 875751
Change-Id: I900590e6674ba0d039033fb5bacfb83f39bcba52
Reviewed-on: https://chromium-review.googlesource.com/1180966Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584457}

chrome/browser/renderer_context_menu/render_view_context_menu.cc

@@ -53,7 +53,6 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
@@ -85,6 +84,7 @@
 #include "components/language/core/browser/language_model_manager.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_match.h"
+#include "components/password_manager/content/browser/content_password_manager_driver.h"
 #include "components/password_manager/core/browser/password_manager_util.h"
 #include "components/password_manager/core/common/experiments.h"
 #include "components/prefs/pref_member.h"
@@ -1582,9 +1582,10 @@ void RenderViewContextMenu::AppendPasswordItems() {
                                       IDS_CONTENT_CONTEXT_FORCESAVEPASSWORD);
       add_separator = true;
     }
-    if (password_manager_util::ManualPasswordGenerationEnabled(
-            ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(
-                browser_context_))) {
+    password_manager::ContentPasswordManagerDriver* driver =
+        password_manager::ContentPasswordManagerDriver::GetForRenderFrameHost(
+            GetRenderFrameHost());
+    if (password_manager_util::ManualPasswordGenerationEnabled(driver)) {
       menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_GENERATEPASSWORD,
                                       IDS_CONTENT_CONTEXT_GENERATEPASSWORD);
       add_separator = true;

components/password_manager/core/browser/password_manager_util.cc

@@ -18,7 +18,9 @@
 #include "components/autofill/core/common/password_generation_util.h"
 #include "components/password_manager/core/browser/hsts_query.h"
 #include "components/password_manager/core/browser/log_manager.h"
+#include "components/password_manager/core/browser/password_generation_manager.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
+#include "components/password_manager/core/browser/password_manager_driver.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/common/password_manager_features.h"
@@ -338,11 +340,15 @@ bool IsLoggingActive(const password_manager::PasswordManagerClient* client) {
   return log_manager && log_manager->IsLoggingActive();
 }
 
-bool ManualPasswordGenerationEnabled(syncer::SyncService* sync_service) {
-  if (password_manager_util::GetPasswordSyncState(sync_service) !=
-      password_manager::SYNCING_NORMAL_ENCRYPTION) {
+bool ManualPasswordGenerationEnabled(
+    password_manager::PasswordManagerDriver* driver) {
+  password_manager::PasswordGenerationManager* password_generation_manager =
+      driver ? driver->GetPasswordGenerationManager() : nullptr;
+  if (!password_generation_manager ||
+      !password_generation_manager->IsGenerationEnabled(false /*logging*/)) {
     return false;
   }
+
   LogPasswordGenerationEvent(
       autofill::password_generation::PASSWORD_GENERATION_CONTEXT_MENU_SHOWN);
   return true;

components/password_manager/core/browser/password_manager_util.h

@@ -24,6 +24,7 @@ class URLRequestContextGetter;
 }
 
 namespace password_manager {
+class PasswordManagerDriver;
 class PasswordManagerClient;
 class PasswordStore;
 }
@@ -71,9 +72,9 @@ void TrimUsernameOnlyCredentials(
 // and required to always return non-null.
 bool IsLoggingActive(const password_manager::PasswordManagerClient* client);
 
-// True iff the manual password generation is enabled and the user is sync user
-// without custom passphrase.
-bool ManualPasswordGenerationEnabled(syncer::SyncService* sync_service);
+// True iff the manual password generation is enabled for the current site.
+bool ManualPasswordGenerationEnabled(
+    password_manager::PasswordManagerDriver* driver);
 
 // Returns true iff the "Show all saved passwords" option should be shown in
 // Context Menu. Also records metric, that the Context Menu will have "Show all