Remove GetActiveEntry usage from content.

content/browser/web_contents/render_view_host_manager_unittest.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/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/browser/web_contents/render_view_host_manager.h"
@@ skipping 932 matching lines @@
   params.page_state = PageState::CreateFromURL(kUrl2);
   contents()->DidNavigate(evil_rvh, params);
 
   // That should have cancelled the pending RVH, and the evil RVH should be the
   // current one.
   EXPECT_TRUE(contents()->GetRenderManagerForTesting()->
       pending_render_view_host() == NULL);
   EXPECT_EQ(evil_rvh, contents()->GetRenderManagerForTesting()->current_host());
 
   // Also we should not have a pending navigation entry.
-  NavigationEntry* entry = contents()->GetController().GetActiveEntry();
+  EXPECT_TRUE(contents()->GetController().GetPendingEntry() == NULL);

[Charlie Reis, 2013/09/16 23:10:54]

nit: Just use EXPECT_FALSE and we won't need the "== NULL"

[nasko, 2013/09/18 17:03:18]

I kept it consistent with the surrounding code, which all uses EXPECT_TRUE with
explicit check inside. If you feel strongly about this, I'll put together
another CL and change all instances to consistently use the other pattern.

[Charlie Reis, 2013/09/18 18:36:05]

Ok.  Feel free to send a cleanup CL to me after this and I'll approve it.

+  NavigationEntry* entry = contents()->GetController().GetVisibleEntry();
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(kUrl2, entry->GetURL());
 }
 
 // Ensure that we can go back and forward even if a SwapOut ACK isn't received.
 // See http://crbug.com/93427.
 TEST_F(RenderViewHostManagerTest, NavigateAfterMissingSwapOutACK) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
 
@@ skipping 245 matching lines @@
 
   // Commit.
   manager.DidNavigateMainFrame(host);
   EXPECT_EQ(host, manager.current_host());
   ASSERT_TRUE(host);
   EXPECT_EQ(static_cast<SiteInstanceImpl*>(host->GetSiteInstance()),
       instance);
 }
 
 }  // namespace content