Browser Plugin: Only update src attribute on top-level navigations

BUG=163665


Review URL: https://chromiumcodereview.appspot.com/11412279

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170611 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/browser_plugin/browser_plugin.cc

@@ -613,13 +613,14 @@ void BrowserPlugin::LoadCommit(
   // If the guest has just committed a new navigation then it is no longer
   // crashed.
   guest_crashed_ = false;
-  src_ = params.url.spec();
+  if (params.is_top_level)
+    src_ = params.url.spec();
   process_id_ = params.process_id;
   current_nav_entry_index_ = params.current_entry_index;
   nav_entry_count_ = params.entry_count;
 
   std::map<std::string, base::Value*> props;
-  props[kURL] = base::Value::CreateStringValue(src_);
+  props[kURL] = base::Value::CreateStringValue(params.url.spec());
   props[kIsTopLevel] = base::Value::CreateBooleanValue(params.is_top_level);
   TriggerEvent(kEventLoadCommit, &props);
 }

content/renderer/browser_plugin/browser_plugin_browsertest.cc

@@ -391,6 +391,8 @@ TEST_F(BrowserPluginTest, CustomEvents) {
     "    removeEventListener('-internal-loadcommit', nav);";
   const char* kGetProcessID =
       "document.getElementById('browserplugin').getProcessId()";
+  const char* kGetSrc =
+      "document.getElementById('browserplugin').src";
   const char* kGoogleURL = "http://www.google.com/";
   const char* kGoogleNewsURL = "http://news.google.com/";
 
@@ -412,21 +414,26 @@ TEST_F(BrowserPluginTest, CustomEvents) {
 
   {
     BrowserPluginMsg_LoadCommit_Params navigate_params;
+    navigate_params.is_top_level = true;
     navigate_params.url = GURL(kGoogleURL);
     navigate_params.process_id = 1337;
     browser_plugin->LoadCommit(navigate_params);
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
+    EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString(kGetSrc));
     EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
   }
   ExecuteJavaScript(kRemoveEventListener);
   {
     BrowserPluginMsg_LoadCommit_Params navigate_params;
+    navigate_params.is_top_level = false;
     navigate_params.url = GURL(kGoogleNewsURL);
     navigate_params.process_id = 42;
     browser_plugin->LoadCommit(navigate_params);
     // The URL variable should not change because we've removed the event
     // listener.
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
+    // The src attribute should not change if this is a top-level navigation.
+    EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString(kGetSrc));
     EXPECT_EQ(42, ExecuteScriptAndReturnInt(kGetProcessID));
   }
 }