| Index: android_webview/native/state_serializer.cc
 | 
| diff --git a/android_webview/native/state_serializer.cc b/android_webview/native/state_serializer.cc
 | 
| index 36589a1bd6b2a0426479a46799f440028fcc262f..e6577bd191c8879ae7d2819d05159c166325252e 100644
 | 
| --- a/android_webview/native/state_serializer.cc
 | 
| +++ b/android_webview/native/state_serializer.cc
 | 
| @@ -113,13 +113,13 @@ bool RestoreFromPickle(base::PickleIterator* iterator,
 | 
|        &restored_entries);
 | 
|    DCHECK_EQ(0u, restored_entries.size());
 | 
|  
 | 
| -  if (controller.GetActiveEntry()) {
 | 
| +  if (controller.GetLastCommittedEntry()) {
 | 
|      // Set up the file access rights for the selected navigation entry.
 | 
|      // TODO(joth): This is duplicated from chrome/.../session_restore.cc and
 | 
|      // should be shared e.g. in  NavigationController. http://crbug.com/68222
 | 
|      const int id = web_contents->GetRenderProcessHost()->GetID();
 | 
|      const content::PageState& page_state =
 | 
| -        controller.GetActiveEntry()->GetPageState();
 | 
| +        controller.GetLastCommittedEntry()->GetPageState();
 | 
|      const std::vector<base::FilePath>& file_paths =
 | 
|          page_state.GetReferencedFiles();
 | 
|      for (std::vector<base::FilePath>::const_iterator file = file_paths.begin();
 | 
| 
 |