Use the media galleries controller interface for the scan result dialog.

chrome/browser/extensions/api/media_galleries/media_galleries_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.
 
 // Implements the Chrome Extensions Media Galleries API.
 
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 
 #include <set>
 #include <string>
@@ skipping 10 matching lines @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
 #include "chrome/browser/extensions/blob_reader.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_histograms.h"
 #include "chrome/browser/media_galleries/media_galleries_permission_controller.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
-#include "chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.h"
+#include "chrome/browser/media_galleries/media_galleries_scan_result_controller.h"
 #include "chrome/browser/media_galleries/media_scan_manager.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/extensions/api/media_galleries.h"
 #include "chrome/common/pref_names.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/blob_handle.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 711 matching lines @@
     // We don't fire a scan progress error here, as it would be unintuitive.
     return false;
   }
   if (!user_gesture())
     return false;
 
   return Setup(GetProfile(), &error_, base::Bind(
       &MediaGalleriesAddScanResultsFunction::OnPreferencesInit, this));
 }
 
-MediaGalleriesScanResultDialogController*
+MediaGalleriesScanResultController*
 MediaGalleriesAddScanResultsFunction::MakeDialog(
     content::WebContents* web_contents,
     const extensions::Extension& extension,
     const base::Closure& on_finish) {
   // Controller will delete itself.
-  return new MediaGalleriesScanResultDialogController(web_contents, extension,
-                                                      on_finish);
+  return new MediaGalleriesScanResultController(web_contents, extension,
+                                                on_finish);
 }
 
 void MediaGalleriesAddScanResultsFunction::OnPreferencesInit() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   const Extension* extension = GetExtension();
   MediaGalleriesPreferences* preferences =
       media_file_system_registry()->GetPreferences(GetProfile());
-  if (MediaGalleriesScanResultDialogController::ScanResultCountForExtension(
+  if (MediaGalleriesScanResultController::ScanResultCountForExtension(
           preferences, extension) == 0) {
     GetAndReturnGalleries();
     return;
   }
 
   WebContents* contents =
       GetWebContents(render_view_host(), GetProfile(), extension->id());
   if (!contents) {
     SendResponse(false);
     return;
@@ skipping 192 matching lines @@
     return;
   }
 
   // All Blobs have been constructed. The renderer will take ownership.
   SetResult(result_dictionary.release());
   SetTransferredBlobUUIDs(*blob_uuids);
   SendResponse(true);
 }
 
 }  // namespace extensions