<webview>: Allocate the view instance ID from the WebView shim

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/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
@@ skipping 174 matching lines @@
 TEST_F(BrowserPluginTest, InitialResize) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   // Verify that the information in Attach is correct.
   BrowserPluginHostMsg_Attach_Params params;
   MockBrowserPlugin* browser_plugin = GetCurrentPluginWithAttachParams(&params);
 
   EXPECT_EQ(640, params.resize_guest_params.view_rect.width());
   EXPECT_EQ(480, params.resize_guest_params.view_rect.height());
   ASSERT_TRUE(browser_plugin);
   // Now the browser plugin is expecting a UpdateRect resize.
-  int instance_id = browser_plugin->instance_id();
+  int instance_id = browser_plugin->guest_instance_id();
   EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
 
   // Send the BrowserPlugin an UpdateRect equal to its container size with
   // the same damage buffer. That should clear |pending_damage_buffer_|.
   BrowserPluginMsg_UpdateRect_Params update_rect_params;
   update_rect_params.damage_buffer_sequence_id =
       browser_plugin->damage_buffer_sequence_id_;
   update_rect_params.view_size = gfx::Size(640, 480);
   update_rect_params.scale_factor = 1.0f;
   update_rect_params.is_resize_ack = true;
@@ skipping 76 matching lines @@
         ExecuteScriptAndReturnString(
             "document.getElementById('browserplugin').src");
     EXPECT_EQ("bar", src_value);
   }
 }
 
 TEST_F(BrowserPluginTest, ResizeFlowControl) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   MockBrowserPlugin* browser_plugin = GetCurrentPlugin();
   ASSERT_TRUE(browser_plugin);
-  int instance_id = browser_plugin->instance_id();
+  int instance_id = browser_plugin->guest_instance_id();
   EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
   // Send an UpdateRect to the BrowserPlugin to make it use the pending damage
   // buffer.
   {
     // We send a stale UpdateRect to the BrowserPlugin.
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(640, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
     update_rect_params.needs_ack = true;
@@ skipping 315 matching lines @@
     // These value are not populated (as an optimization) if autosize is
     // disabled.
     EXPECT_EQ(0, auto_size_params.min_size.width());
     EXPECT_EQ(0, auto_size_params.min_size.height());
     EXPECT_EQ(0, auto_size_params.max_size.width());
     EXPECT_EQ(0, auto_size_params.max_size.height());
   }
 }
 
 }  // namespace content