Remove ChromeRenderFrameObserver::HasRefreshMetaTag.

chrome/renderer/chrome_render_frame_observer.cc

 // Copyright 2013 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/renderer/chrome_render_frame_observer.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 355 matching lines @@
   if (frame->parent())
     return;
 
   GURL osdd_url = frame->document().openSearchDescriptionURL();
   if (!osdd_url.is_empty()) {
     Send(new ChromeViewHostMsg_PageHasOSDD(
         routing_id(), frame->document().url(), osdd_url,
         search_provider::AUTODETECTED_PROVIDER));
   }
 
-  // Don't capture pages including refresh meta tag.
-  if (HasRefreshMetaTag(frame))
+  // Don't capture pages that have pending redirect or location change.
+  if (frame->isNavigationScheduled())
     return;
 
   page_info_.CapturePageInfoLater(
       FINAL_CAPTURE, render_frame(),
       base::TimeDelta::FromMilliseconds(
           render_frame()->GetRenderView()->GetContentStateImmediately()
               ? 0
               : kDelayForCaptureMs));
 }
 
 void ChromeRenderFrameObserver::DidStartProvisionalLoad() {
   // Let translate_helper do any preparatory work for loading a URL.
   if (!translate_helper_)
     return;
 
   translate_helper_->PrepareForUrl(
       render_frame()->GetWebFrame()->document().url());
 }
 
 void ChromeRenderFrameObserver::DidCommitProvisionalLoad(
     bool is_new_navigation,
     bool is_same_page_navigation) {
   WebLocalFrame* frame = render_frame()->GetWebFrame();
 
   // Don't do anything for subframes.
   if (frame->parent())
     return;
 
-  // Don't capture pages being not new, or including refresh meta tag.
-  if (!is_new_navigation || HasRefreshMetaTag(frame))
+  // Don't capture pages being not new, with pending redirect, or location
+  // change.
+  if (!is_new_navigation || frame->isNavigationScheduled())
     return;
 
   base::debug::SetCrashKeyValue(
       crash_keys::kViewCount,
       base::SizeTToString(content::RenderView::GetRenderViewCount()));
 
   page_info_.CapturePageInfoLater(
       PRELIMINARY_CAPTURE, render_frame(),
       base::TimeDelta::FromMilliseconds(kDelayForForcedCaptureMs));
 }
 
-bool ChromeRenderFrameObserver::HasRefreshMetaTag(WebLocalFrame* frame) {
-  if (!frame)
-    return false;
-  WebElement head = frame->document().head();
-  if (head.isNull() || !head.hasChildNodes())
-    return false;
-
-  const WebString tag_name(base::ASCIIToUTF16("meta"));
-  const WebString attribute_name(base::ASCIIToUTF16("http-equiv"));
-
-  WebNodeList children = head.childNodes();
-  for (size_t i = 0; i < children.length(); ++i) {
-    WebNode node = children.item(i);
-    if (!node.isElementNode())
-      continue;
-    WebElement element = node.to<WebElement>();
-    if (!element.hasHTMLTagName(tag_name))
-      continue;
-    WebString value = element.getAttribute(attribute_name);
-    if (value.isNull() ||
-        !base::LowerCaseEqualsASCII(base::StringPiece16(value), "refresh"))
-      continue;
-    return true;
-  }
-  return false;
-}
-
 void ChromeRenderFrameObserver::PageCaptured(base::string16* content,
                                              CaptureType capture_type) {
   if (translate_helper_)
     translate_helper_->PageCaptured(*content);
 
   TRACE_EVENT0("renderer", "ChromeRenderViewObserver::CapturePageInfo");
 
 #if defined(FULL_SAFE_BROWSING)
   // Will swap out the string.
   if (phishing_classifier_)
     phishing_classifier_->PageCaptured(content,
                                        capture_type == PRELIMINARY_CAPTURE);
 #endif
 }