Remove calls to User::email() from chrome/browser/ui/webui/*

chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 250 matching lines @@
   CameraPresenceNotifier::GetInstance()->AddObserver(this);
 }
 
 void ChangePictureOptionsHandler::HandlePageHidden(
     const base::ListValue* args) {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
 }
 
 void ChangePictureOptionsHandler::SendSelectedImage() {
   const user_manager::User* user = GetUser();
-  DCHECK(!user->email().empty());
+  DCHECK(user->GetAccountId().is_valid());
 
   previous_image_index_ = user->image_index();
   switch (previous_image_index_) {
     case user_manager::User::USER_IMAGE_EXTERNAL: {
       // User has image from camera/file, record it and add to the image list.
       previous_image_ = user->GetImage();
       SendOldImage(webui::GetBitmapDataUrl(*previous_image_.bitmap()));
       break;
     }
     case user_manager::User::USER_IMAGE_PROFILE: {
@@ skipping 190 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui());
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return user_manager::UserManager::Get()->GetActiveUser();
   return user;
 }
 
 }  // namespace options
 }  // namespace chromeos