Improve UMA tests; improve no-op reconcilor; new reconcilor test.

components/signin/core/browser/account_reconcilor.h

Index: components/signin/core/browser/account_reconcilor.h
diff --git a/components/signin/core/browser/account_reconcilor.h b/components/signin/core/browser/account_reconcilor.h
index 69a2fc75a12c5083abda048e5ee602737caa1d55..9ea64f242a1c5590eed4652ec92ad135b9528a30 100644
--- a/components/signin/core/browser/account_reconcilor.h
+++ b/components/signin/core/browser/account_reconcilor.h
@@ -116,6 +116,8 @@ class AccountReconcilor : public KeyedService,
   FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileNoopWithDots);
   FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileNoopMultiple);
   FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileAddToCookie);
+  FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,
+                           StartReconcileAddToCookieTwice);
   FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileAddToChrome);
   FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileBadPrimary);
   FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileOnlyOnce);
@@ -167,6 +169,8 @@ class AccountReconcilor : public KeyedService,
       const GoogleServiceAuthError& error,
       const std::vector<std::pair<std::string, bool> >& accounts);
   void ValidateAccountsFromTokenService();
+  void MarkAccountAsAddedToCookie(const std::string& account_id);
+  void MarkAccountAsAddedToChrome(const std::string& account_id);

[Alexei Svitkine (slow), 2014/06/12 17:09:15]

Is there a reason none of these methods have comments? General Chromium style is
to have 1-line comments above all methods.

[Mike Lerman, 2014/06/12 18:12:16]

Added comments for my new methods. I'm not confident enough that I understand
each of the other methods fully to commit to writing comments for all of them.

 
   void OnCookieChanged(const net::CanonicalCookie* cookie);