Eliminate CHECK from CryptohomeLibrary::LoadSystemSalt

chrome/browser/pepper_flash_settings_manager.cc

Index: chrome/browser/pepper_flash_settings_manager.cc
diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc
index 4061463e436bc9f354a15fae3ff96536a89dd9d8..0001f5c9a323f6ab26f951a52511e45d65cdba91 100644
--- a/chrome/browser/pepper_flash_settings_manager.cc
+++ b/chrome/browser/pepper_flash_settings_manager.cc
@@ -125,9 +125,6 @@ class PepperFlashSettingsManager::Core
 
   void InitializeOnIOThread();
   void DeauthorizeContentLicensesOnIOThread(uint32 request_id);
-  void DeauthorizeContentLicensesOnBlockingPool(
-      uint32 request_id,
-      const base::FilePath& profile_path);
   void DeauthorizeContentLicensesInPlugin(uint32 request_id, bool success);
   void GetPermissionSettingsOnIOThread(
       uint32 request_id,
@@ -441,31 +438,7 @@ void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnIOThread(
     return;
   }
 
-#if defined(OS_CHROMEOS)
-  BrowserThread::PostBlockingPoolTask(FROM_HERE,
-      base::Bind(&Core::DeauthorizeContentLicensesOnBlockingPool, this,
-                 request_id, browser_context_path_));
-#else
   DeauthorizeContentLicensesInPlugin(request_id, true);
-#endif
-}
-
-// TODO(raymes): This is temporary code to migrate ChromeOS devices to the new
-// scheme for generating device IDs. Delete this once we are sure most ChromeOS
-// devices have been migrated.

[raymes, 2013/09/16 22:13:38]

Again, I think we need to keep this.

-void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnBlockingPool(
-    uint32 request_id,
-    const base::FilePath& profile_path) {
-  // ChromeOS used to store the device ID in a file but this is no longer used.
-  // Wipe that file.
-  const base::FilePath& device_id_path =
-      chrome::DeviceIDFetcher::GetLegacyDeviceIDPath(profile_path);
-  bool success = base::DeleteFile(device_id_path, false);
-
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&Core::DeauthorizeContentLicensesInPlugin, this, request_id,
-                 success));
 }
 
 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesInPlugin(