Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/bookmarks/bookmark_manager_extension_api.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/bookmarks/bookmark_manager_extension_api.h"
 
 #include <vector>
 
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
@@ skipping 140 matching lines @@
 
   args->Append(value);
 }
 
 }  // namespace
 
 BookmarkManagerExtensionEventRouter::BookmarkManagerExtensionEventRouter(
     Profile* profile, TabContents* tab)
     : profile_(profile),
     tab_(tab) {
-  tab_->bookmark_tab_helper()->SetBookmarkDragDelegate(this);
+  BookmarkTabHelper* bookmark_tab_helper =
+      BookmarkTabHelper::FromWebContents(tab_->web_contents());
+  bookmark_tab_helper->SetBookmarkDragDelegate(this);
 }
 
 BookmarkManagerExtensionEventRouter::~BookmarkManagerExtensionEventRouter() {
-  if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate() == this)
-    tab_->bookmark_tab_helper()->SetBookmarkDragDelegate(NULL);
+  BookmarkTabHelper* bookmark_tab_helper =
+      BookmarkTabHelper::FromWebContents(tab_->web_contents());
+  if (bookmark_tab_helper->GetBookmarkDragDelegate() == this)
+    bookmark_tab_helper->SetBookmarkDragDelegate(NULL);
 }
 
 void BookmarkManagerExtensionEventRouter::DispatchEvent(
     const char* event_name, scoped_ptr<ListValue> args) {
   if (!profile_->GetExtensionEventRouter())
     return;
 
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name, args.Pass(), NULL, GURL(), extensions::EventFilteringInfo());
 }
@@ skipping 331 matching lines @@
   bool can_open_new_windows = true;
 
 #if defined(OS_WIN)
   if (base::win::IsMetroProcess())
     can_open_new_windows = false;
 #endif  // OS_WIN
 
   SetResult(Value::CreateBooleanValue(can_open_new_windows));
   return true;
 }