Remove BrowserPlugin's -internal-attach method

chrome/browser/guest_view/web_view/web_view_guest.cc

 // Copyright 2014 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 "chrome/browser/guest_view/web_view/web_view_guest.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
@@ skipping 235 matching lines @@
       embedder_render_process_host->GetBrowserContext(),
       guest_site_instance);
   params.guest_delegate = this;
   callback.Run(WebContents::Create(params));
 }
 
 void WebViewGuest::DidAttachToEmbedder() {
   SetUpAutoSize();
 
   std::string name;
-  if (extra_params()->GetString(webview::kName, &name)) {
+  if (attach_params()->GetString(webview::kName, &name)) {
     // If the guest window's name is empty, then the WebView tag's name is
     // assigned. Otherwise, the guest window's name takes precedence over the
     // WebView tag's name.
     if (name_.empty())
       name_ = name;
   }
   ReportFrameNameChange(name_);
 
   std::string user_agent_override;
-  if (extra_params()->GetString(webview::kParameterUserAgentOverride,
-                                &user_agent_override)) {
+  if (attach_params()->GetString(webview::kParameterUserAgentOverride,
+                                 &user_agent_override)) {
     SetUserAgentOverride(user_agent_override);
   } else {
     SetUserAgentOverride("");
   }
 
   std::string src;
-  if (extra_params()->GetString("src", &src) && !src.empty())
+  if (attach_params()->GetString("src", &src) && !src.empty())
     NavigateGuest(src);
 
   if (GetOpener()) {
     // We need to do a navigation here if the target URL has changed between
     // the time the WebContents was created and the time it was attached.
     // We also need to do an initial navigation if a RenderView was never
     // created for the new window in cases where there is no referrer.
     PendingWindowMap::iterator it =
         GetOpener()->pending_new_windows_.find(this);
     if (it != GetOpener()->pending_new_windows_.end()) {
@@ skipping 643 matching lines @@
     return true;
   }
 #endif
 
   return false;
 }
 
 void WebViewGuest::SetUpAutoSize() {
   // Read the autosize parameters passed in from the embedder.
   bool auto_size_enabled = false;
-  extra_params()->GetBoolean(webview::kAttributeAutoSize, &auto_size_enabled);
+  attach_params()->GetBoolean(webview::kAttributeAutoSize, &auto_size_enabled);
 
   int max_height = 0;
   int max_width = 0;
-  extra_params()->GetInteger(webview::kAttributeMaxHeight, &max_height);
-  extra_params()->GetInteger(webview::kAttributeMaxWidth, &max_width);
+  attach_params()->GetInteger(webview::kAttributeMaxHeight, &max_height);
+  attach_params()->GetInteger(webview::kAttributeMaxWidth, &max_width);
 
   int min_height = 0;
   int min_width = 0;
-  extra_params()->GetInteger(webview::kAttributeMinHeight, &min_height);
-  extra_params()->GetInteger(webview::kAttributeMinWidth, &min_width);
+  attach_params()->GetInteger(webview::kAttributeMinHeight, &min_height);
+  attach_params()->GetInteger(webview::kAttributeMinWidth, &min_width);
 
   // Call SetAutoSize to apply all the appropriate validation and clipping of
   // values.
   SetAutoSize(auto_size_enabled,
               gfx::Size(min_width, min_height),
               gfx::Size(max_width, max_height));
 }
 
 void WebViewGuest::ShowContextMenu(
     int request_id,
@@ skipping 104 matching lines @@
   // Retrieve the opener partition info if we have it.
   const GURL& site_url = new_contents->GetSiteInstance()->GetSiteURL();
   std::string storage_partition_id = GetStoragePartitionIdFromSiteURL(site_url);
 
   base::DictionaryValue request_info;
   request_info.SetInteger(webview::kInitialHeight, initial_bounds.height());
   request_info.SetInteger(webview::kInitialWidth, initial_bounds.width());
   request_info.Set(webview::kTargetURL,
                    new base::StringValue(new_window_info.url.spec()));
   request_info.Set(webview::kName, new base::StringValue(new_window_info.name));
-  request_info.SetInteger(webview::kWindowID, guest->GetGuestInstanceID());
+  request_info.SetInteger(webview::kWindowID, guest->guest_instance_id());
   // We pass in partition info so that window-s created through newwindow
   // API can use it to set their partition attribute.
   request_info.Set(webview::kStoragePartitionId,
                    new base::StringValue(storage_partition_id));
   request_info.Set(
       webview::kWindowOpenDisposition,
       new base::StringValue(WindowOpenDispositionToString(disposition)));
 
   web_view_permission_helper_->
       RequestPermission(WEB_VIEW_PERMISSION_TYPE_NEW_WINDOW,
                         request_info,
                         base::Bind(&WebViewGuest::OnWebViewNewWindowResponse,
                                    base::Unretained(this),
-                                   guest->GetGuestInstanceID()),
+                                   guest->guest_instance_id()),
                                    false /* allowed_by_default */);
 }
 
 void WebViewGuest::DestroyUnattachedWindows() {
   // Destroy() reaches in and removes the WebViewGuest from its opener's
   // pending_new_windows_ set. To avoid mutating the set while iterating, we
   // create a copy of the pending new windows set and iterate over the copy.
   PendingWindowMap pending_new_windows(pending_new_windows_);
   // Clean up unattached new windows opened by this guest.
   for (PendingWindowMap::const_iterator it = pending_new_windows.begin();
@@ skipping 24 matching lines @@
   WebViewGuest* guest =
       WebViewGuest::From(embedder_render_process_id(), new_window_instance_id);
   if (!guest)
     return;
 
   if (!allow)
     guest->Destroy();
 }
 
 }  // namespace extensions