Kill PropertyBag, switch WebContents to SupportsUserData.

chrome/browser/ui/webui/constrained_web_dialog_delegate_base.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 "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #include <string>
 
-#include "base/property_bag.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
 using content::NativeWebKeyboardEvent;
@@ skipping 14 matching lines @@
   CHECK(delegate);
   WebContents* web_contents =
       WebContents::Create(profile, NULL, MSG_ROUTING_NONE, NULL);
   tab_.reset(new TabContents(web_contents));
   if (tab_delegate) {
     override_tab_delegate_.reset(tab_delegate);
     web_contents->SetDelegate(tab_delegate);
   } else {
     web_contents->SetDelegate(this);
   }
-  // Set |this| as a property so the ConstrainedWebDialogUI can retrieve it.
-  ConstrainedWebDialogUI::GetPropertyAccessor().SetProperty(
-      web_contents->GetPropertyBag(), this);
+  // Set |this| as a delegate so the ConstrainedWebDialogUI can retrieve it.
+  ConstrainedWebDialogUI::SetConstrainedDelegate(web_contents, this);
 
   web_contents->GetController().LoadURL(delegate->GetDialogContentURL(),
                                         content::Referrer(),
                                         content::PAGE_TRANSITION_START_PAGE,
                                         std::string());
 }
 
 ConstrainedWebDialogDelegateBase::~ConstrainedWebDialogDelegateBase() {
   if (release_tab_on_close_)
     ignore_result(tab_.release());
@@ skipping 36 matching lines @@
 }
 
 TabContents* ConstrainedWebDialogDelegateBase::tab() {
   return tab_.get();
 }
 
 void ConstrainedWebDialogDelegateBase::HandleKeyboardEvent(
     content::WebContents* source,
     const NativeWebKeyboardEvent& event) {
 }