[cros] Profile image no longer selected when user clicks Take Photo/Choose File buttons.

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

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 215 matching lines @@
 }
 
 void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
   std::string image_url;
   if (!args ||
       args->GetSize() != 1 ||
       !args->GetString(0, &image_url)) {
     NOTREACHED();
     return;
   }
-  if (image_url.empty())
-    return;
+  DCHECK(!image_url.empty());
 
   UserManager* user_manager = UserManager::Get();
   const User& user = user_manager->logged_in_user();
   int image_index = User::kInvalidImageIndex;
 
   if (StartsWithASCII(image_url, chrome::kChromeUIUserImageURL, false)) {
     // Image from file/camera uses kChromeUIUserImageURL as URL while
     // current profile image always has a full data URL.
     // This way transition from (current profile image) to
     // (profile image, current image from file) is easier.
@@ skipping 80 matching lines @@
 
 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_));
   if (!browser)
     return NULL;
   return browser->window()->GetNativeHandle();
 }
 
 }  // namespace chromeos