android_webview: Replace usage of GetActiveEntry by GetLastCommittedEntry.

android_webview/native/permission/permission_request_handler.cc

 // Copyright 2014 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 "android_webview/native/permission/permission_request_handler.h"
 
 #include "android_webview/native/permission/aw_permission_request.h"
 #include "android_webview/native/permission/aw_permission_request_delegate.h"
 #include "android_webview/native/permission/permission_request_handler_client.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {
 
 namespace {
 
-int GetActiveEntryID(content::WebContents* web_contents) {
+int GetLastCommittedEntryID(content::WebContents* web_contents) {
   if (!web_contents) return 0;
 
-  content::NavigationEntry* active_entry =
-      web_contents->GetController().GetActiveEntry();
-  return active_entry ? active_entry->GetUniqueID() : 0;
+  content::NavigationEntry* entry =
+      web_contents->GetController().GetLastCommittedEntry();
+  return entry ? entry->GetUniqueID() : 0;
 }
 
 }  // namespace
 
 PermissionRequestHandler::PermissionRequestHandler(
-    PermissionRequestHandlerClient* client, content::WebContents* web_contents)
+    PermissionRequestHandlerClient* client,
+    content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       client_(client),
-      contents_unique_id_(GetActiveEntryID(web_contents)) {
+      contents_unique_id_(GetLastCommittedEntryID(web_contents)) {
 }
 
 PermissionRequestHandler::~PermissionRequestHandler() {
   CancelAllRequests();
 }
 
 void PermissionRequestHandler::SendRequest(
     scoped_ptr<AwPermissionRequestDelegate> request) {
   if (Preauthorized(request->GetOrigin(), request->GetResources())) {
     request->NotifyRequestResult(true);
@@ skipping 84 matching lines @@
 bool PermissionRequestHandler::Preauthorized(const GURL& origin,
                                               int64 resources) {
   std::map<std::string, int64>::iterator i =
       preauthorized_permission_.find(origin.GetOrigin().spec());
 
   return i != preauthorized_permission_.end() &&
       (resources & i->second) == resources;
 }
 
 }  // namespace android_webivew