Store original request URL in NavigationEntry

chrome/browser/sessions/base_session_service.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 "chrome/browser/sessions/base_session_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
@@ skipping 169 matching lines @@
 
   pickle.WriteInt(entry.GetTransitionType());
   int type_mask = entry.GetHasPostData() ? TabNavigation::HAS_POST_DATA : 0;
   pickle.WriteInt(type_mask);
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
       entry.GetReferrer().url.is_valid() ?
           entry.GetReferrer().url.spec() : std::string());
   pickle.WriteInt(entry.GetReferrer().policy);
 
+  WriteStringToPickle(pickle, &bytes_written, max_state_size,
+      entry.GetOriginalRequestURL().is_valid() ?
+          entry.GetOriginalRequestURL().spec() : std::string());
+
   // Adding more data? Be sure and update TabRestoreService too.

[Charlie Reis, 2012/04/10 01:37:28]

Do we need to update TabRestoreService?

[gone, 2012/04/10 17:41:34]

I'm fairly certain that that code path snakes all the way back to
session_types.cc, TabNavigation::ToNavigationEntry().

[Charlie Reis, 2012/04/11 20:31:01]

Yeah, I can't figure out what this comment is referring to.  Scott, do we need
to do something to TabRestoreService?  Can we remove or clarify this comment?

[sky, 2012/04/11 21:20:26]

I copied that comment when promoting code from SessionService to
BaseSessionService. It's not applicable anymore, please remove. Sorry for any
confusion.

[gone, 2012/04/12 18:13:35]

Removed.

   return new SessionCommand(command_id, pickle);
 }
 
 SessionCommand* BaseSessionService::CreateSetTabExtensionAppIDCommand(
     SessionID::id_type command_id,
     SessionID::id_type tab_id,
     const std::string& extension_id) {
   // Use pickle to handle marshalling.
   Pickle pickle;
   pickle.WriteInt(tab_id);
@@ skipping 58 matching lines @@
     // the default policy if the property is not present.
     int policy_int;
     WebReferrerPolicy policy;
     if (pickle->ReadInt(&iterator, &policy_int))
       policy = static_cast<WebReferrerPolicy>(policy_int);
     else
       policy = WebKit::WebReferrerPolicyDefault;
     navigation->referrer_ = content::Referrer(
         referrer_spec.empty() ? GURL() : GURL(referrer_spec),
         policy);
+
+    // If the original URL can't be found, leave it empty.
+    std::string url_spec;
+    if (!pickle->ReadString(&iterator, &url_spec))
+      url_spec = "";

[sky, 2012/04/11 21:20:26]

= std::string()

[gone, 2012/04/12 18:13:35]

Done.

+    navigation->set_original_request_url(GURL(url_spec));
   }
 
   navigation->virtual_url_ = GURL(url_spec);
   return true;
 }
 
 bool BaseSessionService::RestoreSetTabExtensionAppIDCommand(
     const SessionCommand& command,
     SessionID::id_type* tab_id,
     std::string* extension_app_id) {
@@ skipping 43 matching lines @@
   if (profile_ && BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
     return BrowserThread::PostTask(BrowserThread::FILE, from_here, task);
   } else {
     // Fall back to executing on the main thread if the file thread
     // has gone away (around shutdown time) or if we're running as
     // part of a unit test that does not set profile_.
     task.Run();
     return true;
   }
 }