Eliminate CHECK from CryptohomeLibrary::LoadSystemSalt

chrome/browser/pepper_flash_settings_manager.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 "chrome/browser/pepper_flash_settings_manager.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
@@ skipping 107 matching lines @@
     uint64 flags;
     uint64 max_age;
   };
 
   virtual ~Core();
 
   void ConnectToChannel(bool success, const IPC::ChannelHandle& handle);
 
   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,
       PP_Flash_BrowserOperations_SettingType setting_type);
   void SetDefaultPermissionOnIOThread(
       uint32 request_id,
       PP_Flash_BrowserOperations_SettingType setting_type,
       PP_Flash_BrowserOperations_Permission permission,
       bool clear_site_specific);
   void SetSitePermissionOnIOThread(
@@ skipping 293 matching lines @@
     return;
   }
 
   pending_responses_.insert(
       std::make_pair(request_id, DEAUTHORIZE_CONTENT_LICENSES));
   if (state_ == STATE_ERROR) {
     NotifyErrorFromIOThread();
     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(
     uint32 request_id,
     bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!success) {
     NotifyErrorFromIOThread();
     return;
   }
@@ skipping 583 matching lines @@
 }
 
 void PepperFlashSettingsManager::OnError(Core* core) {
   DCHECK(core);
   if (core != core_.get())
     return;
 
   core_->Detach();
   core_ = NULL;
 }