Show interstitial from ManagedModeNavigationObserver instead of ManagedModeResourceThrottle.

chrome/browser/managed_mode/managed_mode_resource_throttle.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_resource_throttle.h"
 
 #include "base/lazy_instance.h"
+#include "base/location.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
-#include "chrome/browser/managed_mode/managed_mode_interstitial.h"
+#include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
 #include "net/url_request/url_request.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Uniquely identifies a tab, used to set a temporary exception on it.
 struct WebContentsId {
   WebContentsId(int render_process_host_id, int render_view_id)
       : render_process_host_id(render_process_host_id),
         render_view_id(render_view_id) {}
 
   bool operator<(const WebContentsId& key) const {
     if (render_process_host_id != key.render_process_host_id)
@@ skipping 13 matching lines @@
 };
 
 // This map contains <render_process_host_id_, render_view_id> pairs mapped
 // to |TemporaryExceptionData| which identifies individual tabs. If a
 // |TemporaryExceptionData| is present for a specific pair then the user
 // clicked preview, is navigating around and has not clicked one of the options
 // on the infobar.
 typedef std::map<WebContentsId, TemporaryExceptionData> PreviewMap;
 base::LazyInstance<PreviewMap> g_in_preview_mode = LAZY_INSTANCE_INITIALIZER;
 
-}
+}  // namespace
 
 ManagedModeResourceThrottle::ManagedModeResourceThrottle(
     const net::URLRequest* request,
     int render_process_host_id,
     int render_view_id,
     bool is_main_frame,
     const ManagedModeURLFilter* url_filter)
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       request_(request),
       render_process_host_id_(render_process_host_id),
@@ skipping 62 matching lines @@
   WebContentsId web_contents_id(render_process_host_id_, render_view_id_);
   PreviewMap::iterator it = preview_map->find(web_contents_id);
   if (it != preview_map->end() &&
       (!it->second.new_navigation || url.host() == it->second.host)) {
     temporarily_allowed_ = true;
     RemoveTemporaryException(render_process_host_id_, render_view_id_);
     return;
   }
 
   *defer = true;
-  ManagedModeInterstitial::ShowInterstitial(
-      render_process_host_id_, render_view_id_, url,
-      base::Bind(&ManagedModeResourceThrottle::OnInterstitialResult,
-                 weak_ptr_factory_.GetWeakPtr()));
+
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&ManagedModeNavigationObserver::DidBlockRequest,
+                 render_process_host_id_, render_view_id_, url,

[Adrian Kuegel, 2013/03/28 14:28:34]

Could |render_view_id_| and |url| be in an extra line each?

[Bernhard Bauer, 2013/03/28 15:03:30]

See my comments in
https://codereview.chromium.org/12887005/diff/19001/chrome/browser/managed_mo....
If you feel that it improves readability, I'll do it, but it's not required.

[Adrian Kuegel, 2013/03/28 15:11:11]

I think it is readable enough as it is.

+                 base::Bind(&ManagedModeResourceThrottle::OnInterstitialResult,
+                            weak_ptr_factory_.GetWeakPtr())));
 }
 
 void ManagedModeResourceThrottle::WillStartRequest(bool* defer) {
   ShowInterstitialIfNeeded(false, request_->url(), defer);
 }
 
 void ManagedModeResourceThrottle::WillRedirectRequest(const GURL& new_url,
                                                       bool* defer) {
   ShowInterstitialIfNeeded(true, new_url, defer);
 }
 
 void ManagedModeResourceThrottle::OnInterstitialResult(bool continue_request) {
   if (continue_request) {
     temporarily_allowed_ = true;
     controller()->Resume();
   } else {
     controller()->Cancel();
   }
 }