Put all scan results in the media galleries scan result dialog.

chrome/browser/media_galleries/media_galleries_preferences_unittest.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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
+#include "chrome/common/extensions/permissions/media_galleries_permission.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "grit/generated_resources.h"
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 94 matching lines @@
       default_galleries_count_ = 3;
       MediaGalleriesPrefInfoMap::const_iterator it;
       for (it = known_galleries.begin(); it != known_galleries.end(); ++it) {
         expected_galleries_[it->first] = it->second;
         if (it->second.type == MediaGalleryPrefInfo::kAutoDetected)
           expected_galleries_for_all.insert(it->first);
       }
     }
 
     std::vector<std::string> all_permissions;
-    all_permissions.push_back("allAutoDetected");
-    all_permissions.push_back("read");
+    all_permissions.push_back(
+        extensions::MediaGalleriesPermission::kReadPermission);
+    all_permissions.push_back(
+        extensions::MediaGalleriesPermission::kAllAutoDetectedPermission);
     std::vector<std::string> read_permissions;
-    read_permissions.push_back("read");
+    read_permissions.push_back(
+        extensions::MediaGalleriesPermission::kReadPermission);
 
     all_permission_extension =
         AddMediaGalleriesApp("all", all_permissions, profile_.get());
     regular_permission_extension =
         AddMediaGalleriesApp("regular", read_permissions, profile_.get());
     no_permissions_extension =
         AddMediaGalleriesApp("no", read_permissions, profile_.get());
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 1064 matching lines @@
   info.volume_label = base::string16();
   EXPECT_EQ(ASCIIToUTF16("vendor, model"), info.GetGalleryDisplayName());
 
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::FIXED_MASS_STORAGE, "unique");
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("unique")).AsUTF8Unsafe(),
             base::UTF16ToUTF8(info.GetGalleryTooltip()));
 
   TestStorageMonitor::RemoveSingleton();
 }