Supervised user interstitial: Handle missing custodian profile URL.

chrome/browser/supervised_user/supervised_user_interstitial.cc

 // Copyright 2014 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/supervised_user/supervised_user_interstitial.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 130 matching lines @@
                     l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_TITLE));
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(profile);
 
   bool allow_access_requests = supervised_user_service->AccessRequestsEnabled();
   strings.SetBoolean("allowAccessRequests", allow_access_requests);
 
   GURL profile_url = GURL(profile->GetPrefs()->GetString(

[Bernhard Bauer, 2014/08/21 14:48:46]

Could we rename this to base_url, now that it might not always actually contain
the profile URL?

[Marc Treib, 2014/08/21 15:59:08]

Done.

       prefs::kSupervisedUserCustodianProfileURL));
+  if (!profile_url.is_valid())
+    profile_url = GURL("https://dummy.url");
+  DCHECK(profile_url.is_valid());
   std::string profile_image_url = profile->GetPrefs()->GetString(
       prefs::kSupervisedUserCustodianProfileImageURL);
   strings.SetString("avatarURL1x", BuildAvatarImageUrl(profile_image_url,
                                                        profile_url,
                                                        kAvatarSize1x));
   strings.SetString("avatarURL2x", BuildAvatarImageUrl(profile_image_url,
                                                        profile_url,
                                                        kAvatarSize2x));
 
   GURL profile_url2 = GURL(profile->GetPrefs()->GetString(
       prefs::kSupervisedUserSecondCustodianProfileURL));
+  if (!profile_url2.is_valid())
+    profile_url2 = GURL("https://dummy.url");
+  DCHECK(profile_url2.is_valid());
   std::string profile_image_url2 = profile->GetPrefs()->GetString(
       prefs::kSupervisedUserSecondCustodianProfileImageURL);
   strings.SetString("secondAvatarURL1x", BuildAvatarImageUrl(profile_image_url2,
                                                              profile_url2,
                                                              kAvatarSize1x));
   strings.SetString("secondAvatarURL2x", BuildAvatarImageUrl(profile_image_url2,
                                                              profile_url2,
                                                              kAvatarSize2x));
 
   base::string16 custodian =
@@ skipping 91 matching lines @@
 void SupervisedUserInterstitial::DispatchContinueRequest(
     bool continue_request) {
   // If there is no history entry to go back to, close the tab instead.
   int nav_entry_count = web_contents_->GetController().GetEntryCount();
   if (!continue_request && nav_entry_count == 0)
     web_contents_->Close();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request));
 }