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

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.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 "base/auto_reset.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_folder_finder.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_galleries_test_util.h"
 #include "chrome/browser/media_galleries/media_scan_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "media/base/test_data_util.h"
@@ skipping 56 matching lines @@
     : public extensions::MediaGalleriesAddScanResultsFunction {
  public:
   static ExtensionFunction* Factory() {
     return new TestMediaGalleriesAddScanResultsFunction;
   }
 
  protected:
   virtual ~TestMediaGalleriesAddScanResultsFunction() {}
 
   // Accepts the dialog as soon as it is created.
-  virtual MediaGalleriesScanResultDialogController* MakeDialog(
+  virtual MediaGalleriesScanResultController* MakeDialog(
       content::WebContents* web_contents,
       const extensions::Extension& extension,
       const base::Closure& on_finish) OVERRIDE {
-    MediaGalleriesScanResultDialogController* controller =
+    MediaGalleriesScanResultController* controller =
         extensions::MediaGalleriesAddScanResultsFunction::MakeDialog(
             web_contents, extension, on_finish);
     controller->dialog_->AcceptDialogForTesting();
     // The dialog is closing or closed so don't return it.
     return NULL;
   }
 };
 
 class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
  protected:
@@ skipping 555 matching lines @@
 
   base::ListValue custom_args;
 #if defined(USE_PROPRIETARY_CODECS)
   custom_args.AppendBoolean(true);
 #else
   custom_args.AppendBoolean(false);
 #endif
   ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
       << message_;
 }