More removal of GTK code.

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"
@@ skipping 593 matching lines @@
 
   iapps::SetMacPreferencesForTesting(NULL);
 }
 #endif  // defined(OS_MACOSX)
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, CancelScan) {
   InstallDoNothingFolderFinder();
   ASSERT_TRUE(RunMediaGalleriesTest("cancel_scan")) << message_;
 }
 
-// The scan result dialog is not implemented on GTK because it is going away
-// soon.
-#if defined (TOOLKIT_GTK)
-#define MAYBE_Scan DISABLED_Scan
-#else
-#define MAYBE_Scan Scan
-#endif  // defined (USE_AURA) || defined(OS_MACOSX)
-
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, MAYBE_Scan) {
+IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, Scan) {
   base::ScopedTempDir scan_root;
   ASSERT_TRUE(scan_root.CreateUniqueTempDir());
   std::vector<base::FilePath> roots;
   roots.push_back(scan_root.path());
   SetRootsForFolderFinder(roots);
 
   // Override addScanResults so that the dialog is accepted as soon as it is
   // created.
   ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
       "mediaGalleries.addScanResults",
@@ skipping 43 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_;
 }