Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/extensions/menu_manager.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/extensions/menu_manager.h"
 
 #include <algorithm>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 624 matching lines @@
   if (params.selection_text.length() > 0)
     properties->SetString("selectionText", params.selection_text);
 
   properties->SetBoolean("editable", params.is_editable);
 
   args->Append(properties);
 
   // Add the tab info to the argument list.
   // No tab info in a platform app.
   if (!extension || !extension->is_platform_app()) {
-    // Note: web_contents only NULL in unit tests :(
+    // Note: web_contents are NULL in unit tests :(
     if (web_contents)
       args->Append(ExtensionTabUtil::CreateTabValue(web_contents, extension));
     else
       args->Append(new DictionaryValue());
   }
 
   if (item->type() == MenuItem::CHECKBOX ||
       item->type() == MenuItem::RADIO) {
     bool was_checked = item->checked();
     properties->SetBoolean("wasChecked", was_checked);
 
     // RADIO items always get set to true when you click on them, but CHECKBOX
     // items get their state toggled.
     bool checked =
         (item->type() == MenuItem::RADIO) ? true : !was_checked;
 
     item->SetChecked(checked);
     properties->SetBoolean("checked", item->checked());
 
     if (extension)
       WriteToStorage(extension);
   }
 
-  TabContents* tab_contents = web_contents ?
-      TabContents::FromWebContents(web_contents) : NULL;
-  if (tab_contents && extension) {
-    tab_contents->extension_tab_helper()->active_tab_permission_manager()->
-        GrantIfRequested(extension);
+  // Note: web_contents are NULL in unit tests :(
+  if (web_contents && extensions::TabHelper::FromWebContents(web_contents)) {
+    extensions::TabHelper::FromWebContents(web_contents)->
+        active_tab_permission_manager()->GrantIfRequested(extension);
   }
 
   event_router->DispatchEventToExtension(
       item->extension_id(), event_names::kOnContextMenus,
       scoped_ptr<ListValue>(args->DeepCopy()), profile, GURL(),
       EventRouter::USER_GESTURE_ENABLED);
   event_router->DispatchEventToExtension(
       item->extension_id(), event_names::kOnContextMenuClicked,
       args.Pass(), profile, GURL(),
       EventRouter::USER_GESTURE_ENABLED);
@@ skipping 157 matching lines @@
       if (uid < other.uid)
         return true;
       if (uid == other.uid)
         return string_uid < other.string_uid;
     }
   }
   return false;
 }
 
 }  // namespace extensions