Remove the use of ProvisionalChangeToMainFrameUrl from supervised user code.

chrome/browser/supervised_user/supervised_user_navigation_observer.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_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 160 matching lines @@
   supervised_user_service_ =
       SupervisedUserServiceFactory::GetForProfile(profile);
   url_filter_ = supervised_user_service_->GetURLFilterForUIThread();
 }
 
 void SupervisedUserNavigationObserver::WarnInfoBarDismissed() {
   DCHECK(warn_infobar_);
   warn_infobar_ = NULL;
 }
 
-void SupervisedUserNavigationObserver::ProvisionalChangeToMainFrameUrl(
-    const GURL& url,
-    content::RenderFrameHost* render_frame_host) {
-  SupervisedUserURLFilter::FilteringBehavior behavior =
-      url_filter_->GetFilteringBehaviorForURL(url);
-
-  if (behavior == SupervisedUserURLFilter::WARN || !warn_infobar_)
-    return;
-
-  // If we shouldn't have a warn infobar remove it here.
-  InfoBarService::FromWebContents(web_contents())->RemoveInfoBar(warn_infobar_);
-  warn_infobar_ = NULL;
-}
-
 void SupervisedUserNavigationObserver::DidCommitProvisionalLoadForFrame(
     content::RenderFrameHost* render_frame_host,
     const GURL& url,
     content::PageTransition transition_type) {
   if (render_frame_host->GetParent())
     return;
 
   DVLOG(1) << "DidCommitProvisionalLoadForFrame " << url.spec();
   SupervisedUserURLFilter::FilteringBehavior behavior =
       url_filter_->GetFilteringBehaviorForURL(url);
 
   if (behavior == SupervisedUserURLFilter::WARN && !warn_infobar_) {
     warn_infobar_ = SupervisedUserWarningInfoBarDelegate::Create(
         InfoBarService::FromWebContents(web_contents()));
+  } else if (behavior != SupervisedUserURLFilter::WARN && warn_infobar_) {
+    InfoBarService::FromWebContents(web_contents())->
+        RemoveInfoBar(warn_infobar_);
+    warn_infobar_ = NULL;
   }
 }
 
 // static
 void SupervisedUserNavigationObserver::OnRequestBlocked(
     int render_process_host_id,
     int render_view_id,
     const GURL& url,
     const base::Callback<void(bool)>& callback) {
   content::WebContents* web_contents =
@@ skipping 34 matching lines @@
     history_service->AddPage(add_page_args);
 
   scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetVirtualURL(url);
   entry->SetTimestamp(timestamp);
   blocked_navigations_.push_back(entry.release());
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(profile);
   supervised_user_service->DidBlockNavigation(web_contents());
 }