Revert 157773 - This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.ap…

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 12 matching lines @@
 namespace {
 const char kHTMLForBrowserPluginObject[] =
   "<object id='browserplugin' width='640px' height='480px'"
   "  src='foo' type='%s'>";
 
 std::string GetHTMLForBrowserPluginObject() {
   return StringPrintf(kHTMLForBrowserPluginObject,
                       content::kBrowserPluginNewMimeType);
 }
 
-}  // namespace
+}
 
 namespace content {
 
 BrowserPluginTest::BrowserPluginTest() {}
 
 BrowserPluginTest::~BrowserPluginTest() {}
 
 void BrowserPluginTest::SetUp() {
   GetContentClient()->set_renderer_for_testing(&content_renderer_client_);
   content::RenderViewTest::SetUp();
@@ skipping 63 matching lines @@
 }
 
 // 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.
   {
     const IPC::Message* msg =
     browser_plugin_manager()->sink().GetUniqueMessageMatching(
-        BrowserPluginHostMsg_NavigateGuest::ID);
+        BrowserPluginHostMsg_NavigateOrCreateGuest::ID);
     ASSERT_TRUE(msg);
 
     int instance_id;
     long long frame_id;
     std::string src;
-    gfx::Size size;
-    BrowserPluginHostMsg_NavigateGuest::Read(
+    BrowserPluginHostMsg_NavigateOrCreateGuest::Read(
         msg,
         &instance_id,
         &frame_id,
-        &src,
-        &size);
+        &src);
     EXPECT_EQ("foo", src);
   }
 
   browser_plugin_manager()->sink().ClearMessages();
   // Navigate to bar and observe the associated
-  // BrowserPluginHostMsg_NavigateGuest message.
+  // BrowserPluginHostMsg_NavigateOrCreateGuest message.
   // Verify that the src attribute is updated as well.
   ExecuteJavaScript("document.getElementById('browserplugin').src = 'bar'");
   {
     const IPC::Message* msg =
       browser_plugin_manager()->sink().GetUniqueMessageMatching(
-          BrowserPluginHostMsg_NavigateGuest::ID);
+          BrowserPluginHostMsg_NavigateOrCreateGuest::ID);
     ASSERT_TRUE(msg);
 
     int instance_id;
     long long frame_id;
     std::string src;
-    gfx::Size size;
-    BrowserPluginHostMsg_NavigateGuest::Read(
+    BrowserPluginHostMsg_NavigateOrCreateGuest::Read(
         msg,
         &instance_id,
         &frame_id,
-        &src,
-        &size);
+        &src);
     EXPECT_EQ("bar", src);
     std::string src_value =
         ExecuteScriptAndReturnString(
             "document.getElementById('browserplugin').src");
     EXPECT_EQ("bar", src_value);
   }
 }
 
 TEST_F(BrowserPluginTest, ResizeFlowControl) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
@@ skipping 153 matching lines @@
   EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
 
   ExecuteJavaScript(kRemoveEventListener);
   browser_plugin->DidNavigate(GURL(kGoogleNewsURL));
   // The URL variable should not change because we've removed the event
   // listener.
   EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
 }
 
 }  // namespace content