Simplify some old avatar menu button code.

chrome/browser/profiles/avatar_menu_desktop.cc

 // Copyright 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/profiles/avatar_menu.h"
 
 #include <stddef.h>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "ui/base/resource/resource_bundle.h"
 
 // static
 void AvatarMenu::GetImageForMenuButton(const base::FilePath& profile_path,
                                        gfx::Image* image,
                                        bool* is_rectangle) {
   ProfileAttributesEntry* entry;
   if (!g_browser_process->profile_manager()->GetProfileAttributesStorage().
           GetProfileAttributesWithPath(profile_path, &entry)) {
-    NOTREACHED();

[Peter Kasting, 2016/05/17 03:51:42]

So can this actually be reached, maybe for disk corruption or something?  Might
be nice to add a comment about what case results in this.

[Evan Stade, 2016/05/17 18:13:08]

I made this change because we already had a lot of checks and early returns for
this condition in other parts of the code, so it's not exactly a situation that
can't occur. It's simpler IMO to just call GetImageForMenuButton unconditionally
than to check this condition first. I believe it's explained by this
pre-existing comment, which I'll copy here.

// This can happen if the user deletes the current profile.

     return;
   }
 
   // If there is a Gaia image available, try to use that.
   if (entry->IsUsingGAIAPicture()) {
     const gfx::Image* gaia_image = entry->GetGAIAPicture();
     if (gaia_image) {
       *image = *gaia_image;
       *is_rectangle = true;
       return;
     }
   }
 
   // Otherwise, use the default resource, not the downloaded high-res one.
   const size_t icon_index = entry->GetAvatarIconIndex();
   const int resource_id =
       profiles::GetDefaultAvatarIconResourceIDAtIndex(icon_index);
   *image = ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
   *is_rectangle = false;
 }