[session_manager] Move user session initialization code out of ExistingUserController

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";
 const char kGooglemailDomain[] = "googlemail.com";
 
 std::string CanonicalizeEmailImpl(const std::string& email_address,
                                   bool change_googlemail_to_gmail) {
   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()-1 <<
-        " : " << email_address;
+    NOTREACHED() << "expecting exactly one @, but got "
+                 << (parts.size() ? parts.size() - 1 : parts.size())

[Denis Kuznetsov (DE-MUC), 2014/10/20 13:38:59]

Use 0 in else-case (it look weird otherwise). And condition can use empty()
instead of size().

[Nikita (slow), 2014/10/20 13:52:11]

Done.

+                 << " : " << email_address;
   } else {
     if (change_googlemail_to_gmail && parts[1] == kGooglemailDomain)
       parts[1] = kGmailDomain;
 
     if (parts[1] == kGmailDomain)  // only strip '.' for gmail accounts.
       base::RemoveChars(parts[0], ".", &parts[0]);
   }
 
   std::string new_email = base::StringToLowerASCII(JoinString(parts, at));
   VLOG(1) << "Canonicalized " << email_address << " to " << new_email;
@@ skipping 90 matching lines @@
         accounts->push_back(
             std::make_pair(CanonicalizeEmail(email), is_email_valid != 0));
       }
     }
   }
 
   return true;
 }
 
 }  // namespace gaia