Set the original url correctly if the frame is loaded via loadData

content/renderer/render_frame_impl.h

 // Copyright 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.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 323 matching lines @@
   // this back to private member.
   void OnNavigate(const FrameMsg_Navigate_Params& params);
 
  protected:
   RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
 
  private:
   friend class RenderFrameObserver;
   FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
                            ShouldUpdateSelectionTextFromContextMenuParams);
+  FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
+                           GetOriginalRequestUrlViaLoadData);
+  FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
+                           GetOriginalRequestUrlViaLoadUrlWithoutRedirects);
+  FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
+                           GetOriginalRequestUrlViaLoadUrlWithRedirects);
 
   typedef std::map<GURL, double> HostZoomLevels;
 
   // Functions to add and remove observers for this object.
   void AddObserver(RenderFrameObserver* observer);
   void RemoveObserver(RenderFrameObserver* observer);
 
   void UpdateURL(blink::WebFrame* frame);
 
   // IPC message handlers ------------------------------------------------------
@@ skipping 10 matching lines @@
                                  unsigned action);
 
   // Returns whether |params.selection_text| should be synchronized to the
   // browser before bringing up the context menu. Static for testing.
   static bool ShouldUpdateSelectionTextFromContextMenuParams(
       const base::string16& selection_text,
       size_t selection_text_offset,
       const gfx::Range& selection_range,
       const ContextMenuParams& params);
 
+  // Returns the original request url. If there is no redirect, the original
+  // url is the same as ds->request()->url(). If the WebDataSource belongs to a
+  // frame was loaded by loadData, the original url will be ds->unreachableURL()
+  static GURL GetOriginalRequestUrl(blink::WebDataSource* ds);
+
   // Stores the WebFrame we are associated with.
   blink::WebFrame* frame_;
 
   base::WeakPtr<RenderViewImpl> render_view_;
   int routing_id_;
   bool is_swapped_out_;
   bool is_detaching_;
 
 #if defined(ENABLE_PLUGINS)
   // Current text input composition text. Empty if no composition is in
@@ skipping 20 matching lines @@
   // always respond properly to the request, so we don't have to worry so
   // much about leaks.
   IDMap<ContextMenuClient, IDMapExternalPointer> pending_context_menus_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_