Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: chrome/browser/component_updater/widevine_cdm_component_installer.cc

Issue 16950028: Move file_util::Delete to the base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" 5 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 base::FilePath adapter_path = 295 base::FilePath adapter_path =
296 latest_dir.AppendASCII(kWidevineCdmAdapterFileName); 296 latest_dir.AppendASCII(kWidevineCdmAdapterFileName);
297 base::FilePath cdm_path = latest_dir.AppendASCII(kWidevineCdmFileName); 297 base::FilePath cdm_path = latest_dir.AppendASCII(kWidevineCdmFileName);
298 298
299 if (file_util::PathExists(adapter_path) && 299 if (file_util::PathExists(adapter_path) &&
300 file_util::PathExists(cdm_path)) { 300 file_util::PathExists(cdm_path)) {
301 BrowserThread::PostTask( 301 BrowserThread::PostTask(
302 BrowserThread::UI, FROM_HERE, 302 BrowserThread::UI, FROM_HERE,
303 base::Bind(&RegisterWidevineCdmWithChrome, adapter_path, version)); 303 base::Bind(&RegisterWidevineCdmWithChrome, adapter_path, version));
304 } else { 304 } else {
305 file_util::Delete(latest_dir, true); 305 base::Delete(latest_dir, true);
306 version = base::Version(kNullVersion); 306 version = base::Version(kNullVersion);
307 } 307 }
308 } 308 }
309 309
310 BrowserThread::PostTask( 310 BrowserThread::PostTask(
311 BrowserThread::UI, FROM_HERE, 311 BrowserThread::UI, FROM_HERE,
312 base::Bind(&FinishWidevineCdmUpdateRegistration, cus, version)); 312 base::Bind(&FinishWidevineCdmUpdateRegistration, cus, version));
313 313
314 // Remove older versions of Widevine CDM. 314 // Remove older versions of Widevine CDM.
315 for (std::vector<base::FilePath>::iterator iter = older_dirs.begin(); 315 for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
316 iter != older_dirs.end(); ++iter) { 316 iter != older_dirs.end(); ++iter) {
317 file_util::Delete(*iter, true); 317 base::Delete(*iter, true);
318 } 318 }
319 } 319 }
320 320
321 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) 321 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
322 322
323 } // namespace 323 } // namespace
324 324
325 void RegisterWidevineCdmComponent(ComponentUpdateService* cus) { 325 void RegisterWidevineCdmComponent(ComponentUpdateService* cus) {
326 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) 326 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
327 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 327 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
328 base::Bind(&StartWidevineCdmUpdateRegistration, cus)); 328 base::Bind(&StartWidevineCdmUpdateRegistration, cus));
329 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) 329 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
330 } 330 }
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/test/test_installer.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698