Don't try to close first-navigation tabs when showing the supervised user interstitial inside a <we…

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/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 43 matching lines @@
 
 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 result;
 }
 
 class TabCloser : public content::WebContentsUserData<TabCloser> {
-  // To use, call TabCloser::CreateForWebContents.
+ public:
+  static void MaybeClose(WebContents* web_contents) {
+    // Close the tab if there is no history entry to go back to and there is a
+    // browser for the tab (which is not the case for example in a <webview>).
+    if (!web_contents->GetController().IsInitialBlankNavigation())
+      return;
+
+#if !defined(OS_ANDROID)
+    if (!chrome::FindBrowserWithWebContents(web_contents))
+      return;
+#endif
+    TabCloser::CreateForWebContents(web_contents);
+  }
+
  private:
   friend class content::WebContentsUserData<TabCloser>;
 
   explicit TabCloser(WebContents* web_contents)
       : web_contents_(web_contents), weak_ptr_factory_(this) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&TabCloser::CloseTabImpl, weak_ptr_factory_.GetWeakPtr()));
   }
@@ skipping 223 matching lines @@
     UMA_HISTOGRAM_ENUMERATION("ManagedMode.BlockingInterstitialCommand",
                               BACK,
                               HISTOGRAM_BOUNDING_VALUE);
 
     // The interstitial's reference to the WebContents will go away after the
     // DontProceed call.
     WebContents* web_contents = web_contents_;
     DCHECK(web_contents->GetController().GetTransientEntry());
     interstitial_page_->DontProceed();
 
-    // Close the tab if there is no history entry to go back to.
-    if (web_contents->GetController().IsInitialBlankNavigation())
-      TabCloser::CreateForWebContents(web_contents);
-
+    TabCloser::MaybeClose(web_contents);
     return;
   }
 
   if (command == "\"request\"") {
     UMA_HISTOGRAM_ENUMERATION("ManagedMode.BlockingInterstitialCommand",
                               ACCESS_REQUEST,
                               HISTOGRAM_BOUNDING_VALUE);
 
     SupervisedUserService* supervised_user_service =
         SupervisedUserServiceFactory::GetForProfile(profile_);
@@ skipping 69 matching lines @@
   supervised_user_service->RemoveObserver(this);
 
   if (!callback_.is_null())
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(callback_, continue_request));
 
   // After this, the WebContents may be destroyed. Make sure we don't try to use
   // it again.
   web_contents_ = NULL;
 }