Adding base URL to the frame committed message.

content/browser/renderer_host/render_view_host_browsertest.cc

 // Copyright (c) 2011 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 "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_types.h"
 #include "net/base/host_port_pair.h"
+#include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
 class RenderViewHostTest : public InProcessBrowserTest {
  public:
   RenderViewHostTest() {}
 };
 
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest,
                        ExecuteJavascriptAndGetValue) {
@@ skipping 137 matching lines @@
  public:
   explicit RenderViewHostTestTabContentsObserver(TabContents* tab_contents)
       : TabContentsObserver(tab_contents),
         navigation_count_(0) {}
   virtual ~RenderViewHostTestTabContentsObserver() {}
 
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE {
     observed_socket_address_ = params.socket_address;
+    base_url_ = params.base_url;
     ++navigation_count_;
   }
 
   const net::HostPortPair& observed_socket_address() const {
     return observed_socket_address_;
   }
 
+  GURL base_url() const {
+    return base_url_;
+  }
+
   int navigation_count() const { return navigation_count_; }
 
  private:
   net::HostPortPair observed_socket_address_;
+  GURL base_url_;
   int navigation_count_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestTabContentsObserver);
 };
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {
   ASSERT_TRUE(test_server()->Start());
   RenderViewHostTestTabContentsObserver observer(
       browser()->GetSelectedTabContents());
 
   GURL test_url = test_server()->GetURL("files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   EXPECT_EQ(test_server()->host_port_pair().ToString(),
             observer.observed_socket_address().ToString());
   EXPECT_EQ(1, observer.navigation_count());
 }
+
+// TODO(jcivelli): temporarily disabled while I figure-out why the EOL is
+//                 getting messed-up in google.mht (causing it to fail to load).
+IN_PROC_BROWSER_TEST_F(RenderViewHostTest, DISABLED_BaseURLParam) {
+  ASSERT_TRUE(test_server()->Start());
+  RenderViewHostTestTabContentsObserver observer(
+      browser()->GetSelectedTabContents());
+
+  // Base URL is not set if it is the same as the URL.
+  GURL test_url = test_server()->GetURL("files/simple.html");
+  ui_test_utils::NavigateToURL(browser(), test_url);
+  EXPECT_TRUE(observer.base_url().is_empty());
+  EXPECT_EQ(1, observer.navigation_count());
+
+  // But should be set to the original page when reading MHTML.
+  test_url = net::FilePathToFileURL(test_server()->document_root().Append(
+      FILE_PATH_LITERAL("google.mht")));
+  ui_test_utils::NavigateToURL(browser(), test_url);
+  EXPECT_EQ("http://www.google.com/", observer.base_url().spec());
+}