Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / public / test / test_navigation_observer.cc

diff --git a/src/content/public/test/test_navigation_observer.cc b/src/content/public/test/test_navigation_observer.cc
index e2c69b7..f9dd375 100644 (file)
--- a/src/content/public/test/test_navigation_observer.cc
+++ b/src/content/public/test/test_navigation_observer.cc
@@ -25,20 +25,24 @@ class TestNavigationObserver::TestWebContentsObserver
 
  private:
   // WebContentsObserver:
-  virtual void NavigationEntryCommitted(
-      const LoadCommittedDetails& load_details) OVERRIDE {
+  void NavigationEntryCommitted(
+      const LoadCommittedDetails& load_details) override {
     parent_->OnNavigationEntryCommitted(this, web_contents(), load_details);
   }
 
-  virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE {
-    parent_->OnWebContentsDestroyed(this, web_contents);
+  void DidAttachInterstitialPage() override {
+    parent_->OnDidAttachInterstitialPage(web_contents());
   }
 
-  virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE {
+  void WebContentsDestroyed() override {
+    parent_->OnWebContentsDestroyed(this, web_contents());
+  }
+
+  void DidStartLoading(RenderViewHost* render_view_host) override {
     parent_->OnDidStartLoading(web_contents());
   }
 
-  virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE {
+  void DidStopLoading(RenderViewHost* render_view_host) override {
     parent_->OnDidStopLoading(web_contents());
   }
 
@@ -118,6 +122,13 @@ void TestNavigationObserver::OnNavigationEntryCommitted(
   navigation_started_ = true;
 }
 
+void TestNavigationObserver::OnDidAttachInterstitialPage(
+    WebContents* web_contents) {
+  // Going to an interstitial page does not trigger NavigationEntryCommitted,
+  // but has the same meaning for us here.
+  navigation_started_ = true;
+}
+
 void TestNavigationObserver::OnDidStartLoading(WebContents* web_contents) {
   navigation_started_ = true;
 }