Show interstitial from ManagedModeNavigationObserver instead of ManagedModeResourceThrottle.

chrome/browser/managed_mode/managed_mode_interstitial.cc

 // Copyright (c) 2012 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/managed_mode/managed_mode_interstitial.h"
 
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
 #include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 
-namespace {
-
-void ShowInterstitialOnUIThread(int render_process_host_id,
-                                int render_view_id,
-                                const GURL& url,
-                                const base::Callback<void(bool)>& callback) {
-  // The tab might have been closed.
-  content::WebContents* web_contents =
-      tab_util::GetWebContentsByID(render_process_host_id, render_view_id);
-  if (!web_contents) {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE, base::Bind(callback, true));
-    return;
-  }
-
-  ManagedModeNavigationObserver* navigation_observer =
-      ManagedModeNavigationObserver::FromWebContents(web_contents);
-  if (navigation_observer)
-    navigation_observer->SetStateToRecordingAfterPreview();
-
-  new ManagedModeInterstitial(web_contents, url, callback);
-}
-
-}  // namespace
-
-// static
-void ManagedModeInterstitial::ShowInterstitial(
-    int render_process_host_id,
-    int render_view_id,
-    const GURL& url,
-    const base::Callback<void(bool)>& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&ShowInterstitialOnUIThread, render_process_host_id,
-                                              render_view_id, url, callback));
-}
-
 ManagedModeInterstitial::ManagedModeInterstitial(
     content::WebContents* web_contents,
     const GURL& url,
     const base::Callback<void(bool)>& callback)
     : web_contents_(web_contents),
       url_(url),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       callback_(callback) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ skipping 78 matching lines @@
                               NTP,
                               HISTOGRAM_BOUNDING_VALUE);
     GoToNewTabPage();
     return;
   }
 
   NOTREACHED();
 }
 
 void ManagedModeInterstitial::OnProceed() {
-  DispatchContinueRequest(true);
+  callback_.Run(true);
 }
 
 void ManagedModeInterstitial::OnDontProceed() {
-  DispatchContinueRequest(false);
+  callback_.Run(false);
 }
 
 void ManagedModeInterstitial::OnAuthorizationResult(bool success) {
   if (success)
     interstitial_page_->Proceed();
 }
-
-void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) {
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                          base::Bind(callback_, continue_request));
-}
-