Simplify PasswordFormManagerState

components/password_manager/core/browser/password_form_manager.h

Index: components/password_manager/core/browser/password_form_manager.h
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h
index f201bf91ca9af38325e050c913b1f8c24fdc5774..82c985465aa22ccc359388567d7ef93da976a8c2 100644
--- a/components/password_manager/core/browser/password_form_manager.h
+++ b/components/password_manager/core/browser/password_form_manager.h
@@ -324,6 +324,9 @@ class PasswordFormManager : public PasswordStoreConsumer {
     kFoundGenerationElement
   };
 
+  // State of waiting for a response from a PasswordStore.
+  enum class State { NOT_WAITING, WAITING };

[dvadym, 2016/08/18 09:06:50]

Oh, good to know, I didn't know that it's already allowed to use scoped enums.

[vabr (Chromium), 2016/08/18 09:27:24]

Yes, https://chromium-cpp.appspot.com/ has been allowing them for some time now.

On many places, non-class enums are still a good option, especially when
implicit casting to integers is welcome. Here, however, the namespace scoping
here is helpful, and implicit casting is not needed, so I changed to enum class.

+
   // The maximum number of combinations of the three preceding enums.
   // This is used when recording the actions taken by the form in UMA.
   static const int kMaxNumActionsTaken =
@@ -575,19 +578,10 @@ class PasswordFormManager : public PasswordStoreConsumer {
   // local heuristics.
   bool does_look_like_signup_form_ = false;
 
-  typedef enum {
-    PRE_MATCHING_PHASE,  // Have not yet invoked a GetLogins query to find
-                         // matching login information from password store.
-    MATCHING_PHASE,      // We've made a GetLogins request, but
-                         // haven't received or finished processing result.
-    POST_MATCHING_PHASE  // We've queried the DB and processed matching
-                         // login results.
-  } PasswordFormManagerState;
-
   // State of matching process, used to verify that we don't call methods
   // assuming we've already processed the request for matching logins,
   // when we actually haven't.
-  PasswordFormManagerState state_;
+  State state_;
 
   // The client which implements embedder-specific PasswordManager operations.
   PasswordManagerClient* client_;