Update policy signature verification to include policy domain.

google_apis/gaia/gaia_auth_util.cc

 // Copyright (c) 2012 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 "google_apis/gaia/gaia_auth_util.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "url/gurl.h"
 
 namespace gaia {
 
 namespace {
 const char kGmailDomain[] = "gmail.com";
 }
 
 std::string CanonicalizeEmail(const std::string& email_address) {
   std::vector<std::string> parts;
   char at = '@';
   base::SplitString(email_address, at, &parts);
   if (parts.size() != 2U)
-    NOTREACHED() << "expecting exactly one @, but got " << parts.size();
+    NOTREACHED() << "expecting exactly one @, but got " << parts.size()-1 <<
+        " : " << email_address;
   else if (parts[1] == kGmailDomain)  // only strip '.' for gmail accounts.
     base::RemoveChars(parts[0], ".", &parts[0]);
   std::string new_email = StringToLowerASCII(JoinString(parts, at));
   VLOG(1) << "Canonicalized " << email_address << " to " << new_email;
   return new_email;
 }
 
 std::string CanonicalizeDomain(const std::string& domain) {
   // Canonicalization of domain names means lower-casing them. Make sure to
   // update this function in sync with Canonicalize if this ever changes.
@@ skipping 62 matching lines @@
       // Canonicalize the email since ListAccounts returns "display email".
       if (account->GetString(3, &email) && !email.empty())
         account_ids.push_back(CanonicalizeEmail(email));
     }
   }
 
   return account_ids;
 }
 
 }  // namespace gaia