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

chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
index 20be392c9e772a6466bc5b07b4dfb0b18cb35146..f4aa4848bff590a18bf2f048c2b84623f34f0463 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
@@ -28,7 +28,7 @@
 #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"
@@ -760,14 +760,14 @@ bool MediaGalleriesAddScanResultsFunction::RunAsync() {
       &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() {
@@ -775,7 +775,7 @@ void MediaGalleriesAddScanResultsFunction::OnPreferencesInit() {
   const Extension* extension = GetExtension();
   MediaGalleriesPreferences* preferences =
       media_file_system_registry()->GetPreferences(GetProfile());
-  if (MediaGalleriesScanResultDialogController::ScanResultCountForExtension(
+  if (MediaGalleriesScanResultController::ScanResultCountForExtension(
           preferences, extension) == 0) {
     GetAndReturnGalleries();
     return;