Remove GetActiveEntry usage from content.

content/browser/accessibility/accessibility_ui.cc

 // Copyright (c) 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 "content/browser/accessibility/accessibility_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 57 matching lines @@
   std::string title;
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rvh);
   AccessibilityMode accessibility_mode = rwhi->accessibility_mode();
 
   GURL url;
   GURL favicon_url;
   if (web_contents) {
     url = web_contents->GetURL();
     title = UTF16ToUTF8(web_contents->GetTitle());
     NavigationController& controller = web_contents->GetController();
-    NavigationEntry* entry = controller.GetActiveEntry();
+    NavigationEntry* entry = controller.GetVisibleEntry();
     if (entry != NULL && entry->GetURL().is_valid())
       favicon_url = entry->GetFavicon().url;
   }
 
   return BuildTargetDescriptor(url,
                                title,
                                favicon_url,
                                rvh->GetProcess()->GetID(),

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

I forget-- did we come to a resolution on this?  We've got GetURL,
GetVisibleEntry, and an rvh which could theoretically be last committed,
pending, or neither.  I wonder if there's some way to ensure we'll get a
consistent descriptor here.

Feel free to just make it a TODO, since I'm not sure what the answer is and
GetVisibleEntry seems like the right place to get the favicon.

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

I've added a TODO, since this code will need more changes. I'm not yet 100% sure
how I'll solve the WebContents GetTitle problem, so I'll fix this once this is
known.

                                rvh->GetRoutingID(),
                                accessibility_mode);
 }
 
 void SendTargetsData(
     const WebUIDataSource::GotDataCallback& callback) {
   scoped_ptr<base::ListValue> rvh_list(new base::ListValue());
 
   scoped_ptr<RenderWidgetHostIterator> widgets(
       RenderWidgetHost::GetRenderWidgetHosts());
@@ skipping 149 matching lines @@
       AccessibilityTreeFormatter::Filter::ALLOW));
   formatter->SetFilters(filters);
   formatter->FormatAccessibilityTree(&accessibility_contents_utf16);
 
   result->Set("tree",
               new base::StringValue(UTF16ToUTF8(accessibility_contents_utf16)));
   web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get()));
 }
 
 }  // namespace content