Move credential_manager_types.h to components/password_manager/core.

This makes it possible to use the types it contains in non-Blink
embedders such as iOS. The blink::WebCredential constructor of
CredentialInfo is now a factory function that stayed in content/.

BUG=470815
TBR=jochen

Review URL: https://codereview.chromium.org/1031253003

Cr-Commit-Position: refs/heads/master@{#322376}

chrome/browser/password_manager/account_chooser_infobar_delegate_android.cc

@@ -7,7 +7,7 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/android/infobars/account_chooser_infobar.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 
 // static
 void AccountChooserInfoBarDelegateAndroid::Create(

chrome/browser/password_manager/chrome_password_manager_client.cc

@@ -31,12 +31,12 @@
 #include "components/password_manager/content/browser/content_password_manager_driver.h"
 #include "components/password_manager/content/browser/password_manager_internals_service_factory.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/browser_save_password_progress_logger.h"
 #include "components/password_manager/core/browser/log_receiver.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager_internals_service.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"

chrome/browser/password_manager/chrome_password_manager_client_unittest.cc

@@ -15,9 +15,9 @@
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/password_manager/content/browser/password_manager_internals_service_factory.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/log_receiver.h"
 #include "components/password_manager/core/browser/password_manager_internals_service.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"

chrome/browser/ui/android/infobars/account_chooser_infobar.cc

@@ -7,7 +7,7 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/account_chooser_infobar_delegate_android.h"
 #include "chrome/browser/password_manager/credential_android.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "jni/AccountChooserInfoBar_jni.h"
 
 namespace {

chrome/browser/ui/cocoa/passwords/credential_item_view.h

@@ -9,7 +9,7 @@
 
 #import "base/mac/scoped_nsobject.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 
 @class CredentialItemView;
 class GURL;

chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_account_chooser_view_controller.mm

@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/passwords/account_chooser_more_combobox_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "ui/base/l10n/l10n_util.h"
 
 @implementation CredentialItemCell {

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

@@ -15,8 +15,8 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/feedback/feedback_data.h"
 #include "components/feedback/feedback_util.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_store.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"

chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc

@@ -10,8 +10,8 @@
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "content/public/test/test_browser_thread_bundle.h"

chrome/browser/ui/passwords/manage_passwords_state.cc

@@ -4,10 +4,10 @@
 
 #include "chrome/browser/ui/passwords/manage_passwords_state.h"
 
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/browser_save_password_progress_logger.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 
 using password_manager::PasswordFormManager;
 using autofill::PasswordFormMap;

chrome/browser/ui/passwords/manage_passwords_state_unittest.cc

@@ -5,9 +5,9 @@
 #include "chrome/browser/ui/passwords/manage_passwords_state.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ui/passwords/manage_passwords_test.h

@@ -9,7 +9,7 @@
 #include "base/test/histogram_tester.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

@@ -18,9 +18,9 @@
 #include "chrome/browser/ui/passwords/password_bubble_experiment.h"
 #include "chrome/browser/ui/tab_dialogs.h"
 #include "chrome/common/url_constants.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/browser_save_password_progress_logger.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "content/public/browser/navigation_details.h"
 
 #if defined(OS_ANDROID)

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc

@@ -4,8 +4,8 @@
 
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h"
 
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "content/public/browser/web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

@@ -14,10 +14,10 @@
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/browser/stub_password_manager_driver.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/test/test_browser_thread_bundle.h"

chrome/browser/ui/views/passwords/credentials_item_view.h

@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/passwords/account_avatar_fetcher.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "ui/views/controls/button/label_button.h"
 
 namespace autofill {

components/components_tests.gyp

@@ -306,7 +306,6 @@
     ],
     'password_manager_unittest_sources': [
       'password_manager/content/browser/credential_manager_dispatcher_unittest.cc',
-      'password_manager/content/common/credential_manager_types_unittest.cc',
       'password_manager/core/browser/affiliated_match_helper_unittest.cc',
       'password_manager/core/browser/affiliation_backend_unittest.cc',
       'password_manager/core/browser/affiliation_database_unittest.cc',
@@ -328,6 +327,7 @@
       'password_manager/core/browser/password_store_unittest.cc',
       'password_manager/core/browser/password_syncable_service_unittest.cc',
       'password_manager/core/browser/psl_matching_helper_unittest.cc',
+      'password_manager/core/common/credential_manager_types_unittest.cc',
     ],
     'policy_unittest_sources': [
       'policy/core/browser/autofill_policy_handler_unittest.cc',

components/password_manager.gypi

@@ -192,6 +192,8 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
+        'password_manager/core/common/credential_manager_types.cc',
+        'password_manager/core/common/credential_manager_types.h',
         'password_manager/core/common/experiments.cc',
         'password_manager/core/common/experiments.h',
         'password_manager/core/common/password_manager_pref_names.cc',
@@ -220,11 +222,11 @@
             '..',
           ],
           'sources': [
+            'password_manager/content/common/credential_manager_content_utils.cc',
+            'password_manager/content/common/credential_manager_content_utils.h',
             'password_manager/content/common/credential_manager_message_generator.cc',
             'password_manager/content/common/credential_manager_message_generator.h',
             'password_manager/content/common/credential_manager_messages.h',
-            'password_manager/content/common/credential_manager_types.cc',
-            'password_manager/content/common/credential_manager_types.h',
           ],
         },
         {

components/password_manager/content/browser/credential_manager_dispatcher.cc

@@ -13,9 +13,9 @@
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
 #include "components/password_manager/content/browser/credential_manager_password_form_manager.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "components/password_manager/core/browser/password_store.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"

components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc

@@ -13,10 +13,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "components/password_manager/content/browser/credential_manager_password_form_manager.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/browser/stub_password_manager_driver.h"
 #include "components/password_manager/core/browser/test_password_store.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"

components/password_manager/content/common/BUILD.gn

@@ -4,11 +4,11 @@
 
 static_library("common") {
   sources = [
+    "credential_manager_content_utils.cc",
+    "credential_manager_content_utils.h",
     "credential_manager_message_generator.cc",
     "credential_manager_message_generator.h",
     "credential_manager_messages.h",
-    "credential_manager_types.cc",
-    "credential_manager_types.h",
   ]
 
   deps = [

components/password_manager/content/common/credential_manager_content_utils.cc

+// Copyright 2015 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 "components/password_manager/content/common/credential_manager_content_utils.h"
+
+#include "base/logging.h"
+#include "third_party/WebKit/public/platform/WebCredential.h"
+#include "third_party/WebKit/public/platform/WebFederatedCredential.h"
+#include "third_party/WebKit/public/platform/WebLocalCredential.h"
+
+namespace password_manager {
+
+CredentialInfo WebCredentialToCredentialInfo(
+    const blink::WebCredential& credential) {
+  CredentialInfo credential_info;
+  credential_info.id = credential.id();
+  credential_info.name = credential.name();
+  credential_info.avatar = credential.avatarURL();
+  credential_info.type = credential.isLocalCredential()
+                             ? CredentialType::CREDENTIAL_TYPE_LOCAL
+                             : CredentialType::CREDENTIAL_TYPE_FEDERATED;
+  if (credential_info.type == CredentialType::CREDENTIAL_TYPE_LOCAL) {
+    DCHECK(credential.isLocalCredential());
+    credential_info.password =
+        static_cast<const blink::WebLocalCredential&>(credential).password();
+  } else {
+    DCHECK(credential.isFederatedCredential());
+    credential_info.federation =
+        static_cast<const blink::WebFederatedCredential&>(credential)
+            .federation();
+  }
+  return credential_info;
+}
+
+}  // namespace password_manager

components/password_manager/content/common/credential_manager_content_utils.h

+// Copyright 2015 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.
+
+#ifndef COMPONENTS_PASSWORD_MANAGER_CONTENT_COMMON_CREDENTIAL_MANAGER_CONTENT_UTILS_H_
+#define COMPONENTS_PASSWORD_MANAGER_CONTENT_COMMON_CREDENTIAL_MANAGER_CONTENT_UTILS_H_
+
+#include "components/password_manager/core/common/credential_manager_types.h"
+
+namespace blink {
+class WebCredential;
+};
+
+namespace password_manager {
+
+// Returns a CredentialInfo struct populated from |credential|.
+CredentialInfo WebCredentialToCredentialInfo(
+    const blink::WebCredential& credential);
+
+}  // namespace password_manager
+
+#endif  // COMPONENTS_PASSWORD_MANAGER_CONTENT_COMMON_CREDENTIAL_MANAGER_CONTENT_UTILS_H_

components/password_manager/content/common/credential_manager_messages.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/common_param_traits_macros.h"
 #include "ipc/ipc_message_macros.h"

components/password_manager/content/renderer/credential_manager_client.cc

@@ -4,8 +4,9 @@
 
 #include "components/password_manager/content/renderer/credential_manager_client.h"
 
+#include "components/password_manager/content/common/credential_manager_content_utils.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/platform/WebCredential.h"
 #include "third_party/WebKit/public/platform/WebCredentialManagerError.h"
@@ -116,7 +117,7 @@ void CredentialManagerClient::dispatchFailedSignIn(
     const blink::WebCredential& credential,
     blink::WebCredentialManagerClient::NotificationCallbacks* callbacks) {
   int request_id = failed_sign_in_callbacks_.Add(callbacks);
-  CredentialInfo info(credential);
+  CredentialInfo info(WebCredentialToCredentialInfo(credential));
   Send(new CredentialManagerHostMsg_NotifyFailedSignIn(
       routing_id(), request_id, info));
 }
@@ -125,7 +126,7 @@ void CredentialManagerClient::dispatchSignedIn(
     const blink::WebCredential& credential,
     blink::WebCredentialManagerClient::NotificationCallbacks* callbacks) {
   int request_id = signed_in_callbacks_.Add(callbacks);
-  CredentialInfo info(credential);
+  CredentialInfo info(WebCredentialToCredentialInfo(credential));
   Send(new CredentialManagerHostMsg_NotifySignedIn(
       routing_id(), request_id, info));
 }

components/password_manager/core/common/BUILD.gn

@@ -4,6 +4,8 @@
 
 static_library("common") {
   sources = [
+    "credential_manager_types.cc",
+    "credential_manager_types.h",
     "experiments.cc",
     "experiments.h",
     "password_manager_pref_names.cc",

components/password_manager/content/common/credential_manager_types.cc → components/password_manager/core/common/credential_manager_types.cc

@@ -2,37 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 
 #include "base/logging.h"
 #include "components/autofill/core/common/password_form.h"
-#include "third_party/WebKit/public/platform/WebCredential.h"
-#include "third_party/WebKit/public/platform/WebFederatedCredential.h"
-#include "third_party/WebKit/public/platform/WebLocalCredential.h"
 
 namespace password_manager {
 
 CredentialInfo::CredentialInfo() : type(CredentialType::CREDENTIAL_TYPE_EMPTY) {
 }
 
-CredentialInfo::CredentialInfo(const blink::WebCredential& credential)
-    : id(credential.id()),
-      name(credential.name()),
-      avatar(credential.avatarURL()) {
-  type = credential.isLocalCredential()
-             ? CredentialType::CREDENTIAL_TYPE_LOCAL
-             : CredentialType::CREDENTIAL_TYPE_FEDERATED;
-  if (type == CredentialType::CREDENTIAL_TYPE_LOCAL) {
-    DCHECK(credential.isLocalCredential());
-    password =
-        static_cast<const blink::WebLocalCredential&>(credential).password();
-  } else {
-    DCHECK(credential.isFederatedCredential());
-    federation = static_cast<const blink::WebFederatedCredential&>(credential)
-                     .federation();
-  }
-}
-
 CredentialInfo::CredentialInfo(const autofill::PasswordForm& form,
                                CredentialType form_type)
     : type(form_type),

components/password_manager/content/common/credential_manager_types.h → components/password_manager/core/common/credential_manager_types.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PASSWORD_MANAGER_CONTENT_COMMON_CREDENTIAL_MANAGER_TYPES_H_
-#define COMPONENTS_PASSWORD_MANAGER_CONTENT_COMMON_CREDENTIAL_MANAGER_TYPES_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_COMMON_CREDENTIAL_MANAGER_TYPES_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_COMMON_CREDENTIAL_MANAGER_TYPES_H_
 
 #include <string>
 
@@ -16,10 +16,6 @@ namespace autofill {
 struct PasswordForm;
 }
 
-namespace blink {
-class WebCredential;
-};
-
 namespace password_manager {
 
 // Limit the size of the federations array that we pass to the browser to
@@ -36,9 +32,7 @@ enum class CredentialType : unsigned int {
 
 struct CredentialInfo {
   CredentialInfo();
-  explicit CredentialInfo(const blink::WebCredential& credential);
-  explicit CredentialInfo(const autofill::PasswordForm& form,
-                          CredentialType form_type);
+  CredentialInfo(const autofill::PasswordForm& form, CredentialType form_type);
   ~CredentialInfo();
 
   CredentialType type;
@@ -71,4 +65,4 @@ scoped_ptr<autofill::PasswordForm> CreatePasswordFormFromCredentialInfo(
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CONTENT_COMMON_CREDENTIAL_MANAGER_TYPES_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_COMMON_CREDENTIAL_MANAGER_TYPES_H_

components/password_manager/content/common/credential_manager_types_unittest.cc → components/password_manager/core/common/credential_manager_types_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/content/common/credential_manager_types.h"
+#include "components/password_manager/core/common/credential_manager_types.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"