[Extensions] Clean up the handling of ExtensionHostMsg_Request

chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_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/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 527 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(params);
 
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   std::vector<const BookmarkNode*> nodes;
   EXTENSION_FUNCTION_VALIDATE(
       GetNodesFromVector(model, params->id_list, &nodes));
 
   WebContents* web_contents =
       WebContents::FromRenderViewHost(render_view_host_);
   if (GetViewType(web_contents) == VIEW_TYPE_TAB_CONTENTS) {
-    WebContents* web_contents =
-        dispatcher()->delegate()->GetAssociatedWebContents();
+    WebContents* web_contents = GetAssociatedWebContents();
     CHECK(web_contents);
 
     ui::DragDropTypes::DragEventSource source =
         ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE;
     if (params->is_from_touch)
       source = ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH;
 
     chrome::DragBookmarks(
         GetProfile(), nodes, web_contents->GetNativeView(), source);
 
@@ skipping 19 matching lines @@
 
   int drop_index;
   if (params->index)
     drop_index = *params->index;
   else
     drop_index = drop_parent->child_count();
 
   WebContents* web_contents =
       WebContents::FromRenderViewHost(render_view_host_);
   if (GetViewType(web_contents) == VIEW_TYPE_TAB_CONTENTS) {
-    WebContents* web_contents =
-        dispatcher()->delegate()->GetAssociatedWebContents();
+    WebContents* web_contents = GetAssociatedWebContents();
     CHECK(web_contents);
     ExtensionWebUI* web_ui =
         static_cast<ExtensionWebUI*>(web_contents->GetWebUI()->GetController());
     CHECK(web_ui);
     BookmarkManagerPrivateDragEventRouter* router =
         web_ui->bookmark_manager_private_drag_event_router();
 
     DCHECK(router);
     const BookmarkNodeData* drag_data = router->GetBookmarkNodeData();
     if (drag_data == NULL) {
@@ skipping 234 matching lines @@
 
   enhanced_bookmarks::EnhancedBookmarkModel* model =
       enhanced_bookmarks::EnhancedBookmarkModelFactory::GetForBrowserContext(
           browser_context());
   model->SetVersionSuffix(params->version);
 
   return true;
 }
 
 }  // namespace extensions