Browser Plugin: Implement CanGoBack/CanGoForward

content/browser/browser_plugin/browser_plugin_host_browsertest.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 "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
@@ skipping 512 matching lines @@
   // Navigate to P3 and verify that the navigation occurred.
   {
     const string16 expected_title = ASCIIToUTF16("P3");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
     rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
         StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P3").c_str())));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);

[Charlie Reis, 2012/10/10 06:06:53]

Probably worth checking that canGoForward is false and canGoBack is true, before
we start using back and forward.

   }
 
   // Go back and verify that we're back at P2.
   {
     const string16 expected_title = ASCIIToUTF16("P2");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
+    base::Value* value =
+        rvh->ExecuteJavascriptAndGetValue(string16(),
+                                          ASCIIToUTF16("CanGoBack()"));
+    bool result = false;
+    ASSERT_TRUE(value->GetAsBoolean(&result));
+    EXPECT_TRUE(result);

[Charlie Reis, 2012/10/10 06:06:53]

I think it would be clearer to move this check after the Back(), and also check
that CanGoForward() is true.  (Otherwise it reads strangely because the comment
above makes it sound like the back navigation has already happened.)

[Fady Samuel, 2012/10/10 17:36:44]

Done.

     rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16("Back();"));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   // Go forward and verify that we're back at P3.
   {
     const string16 expected_title = ASCIIToUTF16("P3");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
+    base::Value* value =
+        rvh->ExecuteJavascriptAndGetValue(string16(),
+                                          ASCIIToUTF16("CanGoForward()"));
+    bool result = false;
+    ASSERT_TRUE(value->GetAsBoolean(&result));
+    EXPECT_TRUE(result);
     rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16("Forward();"));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   // Go back two entries and verify that we're back at P1.
   {
     const string16 expected_title = ASCIIToUTF16("P1");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
+    base::Value* value =
+        rvh->ExecuteJavascriptAndGetValue(string16(),
+                                          ASCIIToUTF16("CanGoBack()"));
+    bool result = false;
+    ASSERT_TRUE(value->GetAsBoolean(&result));
+    EXPECT_TRUE(result);

[Charlie Reis, 2012/10/10 06:06:53]

Again, we should be testing cases when CanGoBack returns false (i.e., after the
Go(-2)).

[Fady Samuel, 2012/10/10 17:36:44]

Done.

     rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16("Go(-2);"));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 }
 
 // This tests verifies that reloading the embedder does not crash the browser
 // and that the guest is reset.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadEmbedder) {
@@ skipping 120 matching lines @@
   EXPECT_TRUE(v->GetAsString(&result));
   EXPECT_EQ(redirect_url.spec().c_str(), result);
 
   v = rvh->ExecuteJavascriptAndGetValue(
       string16(), ASCIIToUTF16("redirectNewUrl"));
   EXPECT_TRUE(v->GetAsString(&result));
   EXPECT_EQ(test_server()->GetURL("files/title1.html").spec().c_str(), result);
 }
 
 }  // namespace content