Propagate storage partition id and persistence to the browser.

content/renderer/browser_plugin/browser_plugin_browsertest.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 "content/renderer/browser_plugin/browser_plugin_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/common/browser_plugin_messages.h"
@@ skipping 115 matching lines @@
   browser_plugin->UpdateRect(0, update_rect_params);
   EXPECT_FALSE(browser_plugin->resize_pending_);
 }
 
 // Verify that the src attribute on the browser plugin works as expected.
 TEST_F(BrowserPluginTest, SrcAttribute) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   // Verify that we're reporting the correct URL to navigate to based on the
   // src attribute.
   {
+    // Ensure we get a CreateGuest on the initial navigation.
+    const IPC::Message* create_msg =
+    browser_plugin_manager()->sink().GetUniqueMessageMatching(
+        BrowserPluginHostMsg_CreateGuest::ID);
+    ASSERT_TRUE(create_msg);
+
     const IPC::Message* msg =
     browser_plugin_manager()->sink().GetUniqueMessageMatching(
         BrowserPluginHostMsg_NavigateGuest::ID);
     ASSERT_TRUE(msg);
 
     int instance_id;
     std::string src;
     BrowserPluginHostMsg_ResizeGuest_Params resize_params;
     BrowserPluginHostMsg_NavigateGuest::Read(
         msg,
         &instance_id,
         &src,
         &resize_params);
     EXPECT_EQ("foo", src);
   }
 
   browser_plugin_manager()->sink().ClearMessages();
   // Navigate to bar and observe the associated
   // BrowserPluginHostMsg_NavigateGuest message.
   // Verify that the src attribute is updated as well.
   ExecuteJavaScript("document.getElementById('browserplugin').src = 'bar'");
   {
+    // Verify that we do not get a CreateGuest on subsequent navigations.
+    const IPC::Message* create_msg =
+    browser_plugin_manager()->sink().GetUniqueMessageMatching(
+        BrowserPluginHostMsg_CreateGuest::ID);
+    ASSERT_FALSE(create_msg);
+
     const IPC::Message* msg =
       browser_plugin_manager()->sink().GetUniqueMessageMatching(
           BrowserPluginHostMsg_NavigateGuest::ID);
     ASSERT_TRUE(msg);
 
     int instance_id;
     std::string src;
     BrowserPluginHostMsg_ResizeGuest_Params resize_params;
     BrowserPluginHostMsg_NavigateGuest::Read(
         msg,
@@ skipping 251 matching lines @@
   std::string partition_value = ExecuteScriptAndReturnString(
       "document.getElementById('browserplugin').partition");
   EXPECT_STREQ("storage", partition_value.c_str());
 
   std::string src_value = ExecuteScriptAndReturnString(
       "document.getElementById('browserplugin').src");
   EXPECT_STREQ("", src_value.c_str());
 
   ExecuteJavaScript("document.getElementById('browserplugin').src = 'bar'");
   {
+    const IPC::Message* create_msg =
+    browser_plugin_manager()->sink().GetUniqueMessageMatching(
+        BrowserPluginHostMsg_CreateGuest::ID);
+    ASSERT_TRUE(create_msg);
+
+    int create_instance_id;
+    std::string storage_partition;
+    bool persist_storage = true;
+    BrowserPluginHostMsg_CreateGuest::Read(
+        create_msg,
+        &create_instance_id,
+        &storage_partition,
+        &persist_storage);
+    EXPECT_STREQ("storage", storage_partition.c_str());
+    EXPECT_FALSE(persist_storage);
+
     const IPC::Message* msg =
         browser_plugin_manager()->sink().GetUniqueMessageMatching(
             BrowserPluginHostMsg_NavigateGuest::ID);
     ASSERT_TRUE(msg);
 
     int instance_id;
     std::string src;
     BrowserPluginHostMsg_ResizeGuest_Params resize_params;
     BrowserPluginHostMsg_NavigateGuest::Read(
         msg,
         &instance_id,
         &src,
         &resize_params);
     EXPECT_STREQ("bar", src.c_str());
+    EXPECT_EQ(create_instance_id, instance_id);
   }
 
   // Setting the partition should throw an exception and the value should not
   // change.
   ExecuteJavaScript(
       "try {"
       "  document.getElementById('browserplugin').partition = 'someid';"
       "  document.title = 'success';"
       "} catch (e) { document.title = e.message; }");
 
   std::string title = ExecuteScriptAndReturnString("document.title");
   EXPECT_STREQ(
       "The object has already navigated, so its partition cannot be changed.",
       title.c_str());
 
   partition_value = ExecuteScriptAndReturnString(
       "document.getElementById('browserplugin').partition");
   EXPECT_STREQ("storage", partition_value.c_str());
 }
 
 }  // namespace content