Supervised user interstitial: Remove image URL resolving hack.

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 19 matching lines @@
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
 static const int kAvatarSize1x = 45;
 static const int kAvatarSize2x = 90;
 
-std::string BuildAvatarImageUrl(const std::string& url,
-                                const GURL& base_url,
-                                int size) {
+std::string BuildAvatarImageUrl(const std::string& url, int size) {
   std::string result = url;
   size_t slash = result.rfind('/');
   if (slash != std::string::npos)
     result.insert(slash, "/s" + base::IntToString(size));
-  return base_url.Resolve(result).spec();
+  return result;
 }
 
 } // namespace
 
 // static
 void SupervisedUserInterstitial::Show(
     content::WebContents* web_contents,
     const GURL& url,
     const base::Callback<void(bool)>& callback) {
   SupervisedUserInterstitial* interstitial =
@@ skipping 83 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 base_url = GURL(profile->GetPrefs()->GetString(
-      prefs::kSupervisedUserCustodianProfileURL));
-  if (!base_url.is_valid())
-    base_url = GURL("https://dummy.url");
-  DCHECK(base_url.is_valid());
   std::string profile_image_url = profile->GetPrefs()->GetString(
       prefs::kSupervisedUserCustodianProfileImageURL);
   strings.SetString("avatarURL1x", BuildAvatarImageUrl(profile_image_url,
-                                                       base_url,
                                                        kAvatarSize1x));
   strings.SetString("avatarURL2x", BuildAvatarImageUrl(profile_image_url,
-                                                       base_url,
                                                        kAvatarSize2x));
 
-  GURL base_url2 = GURL(profile->GetPrefs()->GetString(
-      prefs::kSupervisedUserSecondCustodianProfileURL));
-  if (!base_url2.is_valid())
-    base_url2 = GURL("https://dummy.url");
-  DCHECK(base_url2.is_valid());
   std::string profile_image_url2 = profile->GetPrefs()->GetString(
       prefs::kSupervisedUserSecondCustodianProfileImageURL);
   strings.SetString("secondAvatarURL1x", BuildAvatarImageUrl(profile_image_url2,
-                                                             base_url2,
                                                              kAvatarSize1x));
   strings.SetString("secondAvatarURL2x", BuildAvatarImageUrl(profile_image_url2,
-                                                             base_url2,
                                                              kAvatarSize2x));
 
   base::string16 custodian =
       base::UTF8ToUTF16(supervised_user_service->GetCustodianName());
   strings.SetString(
       "blockPageMessage",
       allow_access_requests
           ? l10n_util::GetStringFUTF16(IDS_BLOCK_INTERSTITIAL_MESSAGE,
                                        custodian)
           : l10n_util::GetStringUTF16(
@@ skipping 84 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));
 }