[Extensions] Clean up the handling of ExtensionHostMsg_Request

chrome/browser/extensions/api/downloads/downloads_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/downloads/downloads_api.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 1227 matching lines @@
       downloads::AcceptDanger::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   PromptOrWait(params->download_id, 10);
   return true;
 }
 
 void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) {
   DownloadItem* download_item =
       GetDownload(GetProfile(), include_incognito(), download_id);
   content::WebContents* web_contents =
-      dispatcher()->delegate()->GetVisibleWebContents();
+      dispatcher()->GetVisibleWebContents();

[not at google - send to devlin, 2015/06/10 18:37:49]

I think this will fit on 1 line (and I would hope that clang-format realises
that).

[Devlin, 2015/06/10 20:59:20]

Done.

   if (InvalidId(download_item, &error_) ||
       Fault(download_item->GetState() != DownloadItem::IN_PROGRESS,
             errors::kNotInProgress, &error_) ||
       Fault(!download_item->IsDangerous(), errors::kNotDangerous, &error_) ||
       Fault(!web_contents, errors::kInvisibleContext, &error_)) {
     SendResponse(error_.empty());
     return;
   }
   bool visible = platform_util::IsVisible(web_contents->GetNativeView());
   if (!visible) {
@@ skipping 107 matching lines @@
 
 DownloadsDragFunction::~DownloadsDragFunction() {}
 
 bool DownloadsDragFunction::RunAsync() {
   scoped_ptr<downloads::Drag::Params> params(
       downloads::Drag::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   DownloadItem* download_item =
       GetDownload(GetProfile(), include_incognito(), params->download_id);
   content::WebContents* web_contents =
-      dispatcher()->delegate()->GetVisibleWebContents();
+      dispatcher()->GetVisibleWebContents();
   if (InvalidId(download_item, &error_) ||
       Fault(!web_contents, errors::kInvisibleContext, &error_))
     return false;
   RecordApiFunctions(DOWNLOADS_FUNCTION_DRAG);
   gfx::Image* icon = g_browser_process->icon_manager()->LookupIconFromFilepath(
       download_item->GetTargetFilePath(), IconLoader::NORMAL);
   gfx::NativeView view = web_contents->GetNativeView();
   {
     // Enable nested tasks during DnD, while |DragDownload()| blocks.
     base::MessageLoop::ScopedNestableTaskAllower allow(
@@ skipping 88 matching lines @@
       Fault(download_item->GetTargetFilePath().empty(),
             errors::kEmptyFile, &error_))
     return false;
   // In-progress downloads return the intermediate filename for GetFullPath()
   // which doesn't have the final extension. Therefore a good file icon can't be
   // found, so use GetTargetFilePath() instead.
   DCHECK(icon_extractor_.get());
   DCHECK(icon_size == 16 || icon_size == 32);
   float scale = 1.0;
   content::WebContents* web_contents =
-      dispatcher()->delegate()->GetVisibleWebContents();
+      dispatcher()->GetVisibleWebContents();
   if (web_contents) {
     scale = ui::GetScaleFactorForNativeView(
         web_contents->GetRenderWidgetHostView()->GetNativeView());
   }
   EXTENSION_FUNCTION_VALIDATE(icon_extractor_->ExtractIconURLForPath(
       download_item->GetTargetFilePath(),
       scale,
       IconLoaderSizeFromPixelSize(icon_size),
       base::Bind(&DownloadsGetFileIconFunction::OnIconURLExtracted, this)));
   return true;
@@ skipping 404 matching lines @@
     return;
   base::Time now(base::Time::Now());
   int delta = now.ToTimeT() - last_checked_removal_.ToTimeT();
   if (delta <= kFileExistenceRateLimitSeconds)
     return;
   last_checked_removal_ = now;
   manager->CheckForHistoryFilesRemoval();
 }
 
 }  // namespace extensions