chrome/browser/load_library_perf_test.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/load_library_perf_test.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 4 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

« no previous file with comments | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/local_discovery/privet_http_impl.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "base/file_util.h"

6 #include "base/files/file_path.h"	5 #include "base/files/file_path.h"

	6 #include "base/files/file_util.h"

7 #include "base/path_service.h"	7 #include "base/path_service.h"

8 #include "base/scoped_native_library.h"	8 #include "base/scoped_native_library.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "base/time/time.h"	10 #include "base/time/time.h"

11 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/include/gtest/gtest.h"

12 #include "testing/perf/perf_test.h"	12 #include "testing/perf/perf_test.h"

13 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.	13 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.

14	14

15 // Measures the size (bytes) and time to load (sec) of a native library.	15 // Measures the size (bytes) and time to load (sec) of a native library.

16 void MeasureSizeAndTimeToLoadNativeLibrary(const base::FilePath& library_name) {	16 void MeasureSizeAndTimeToLoadNativeLibrary(const base::FilePath& library_name) {

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75	75

76 TEST(LoadCDMPerfTest, ExternalClearKeyAdapter) {	76 TEST(LoadCDMPerfTest, ExternalClearKeyAdapter) {

77 #if defined(OS_MACOSX)	77 #if defined(OS_MACOSX)

78 MeasureSizeAndTimeToLoadNativeLibrary(	78 MeasureSizeAndTimeToLoadNativeLibrary(

79 base::FilePath::FromUTF8Unsafe("clearkeycdmadapter.plugin"));	79 base::FilePath::FromUTF8Unsafe("clearkeycdmadapter.plugin"));

80 #else	80 #else

81 MeasureSizeAndTimeToLoadNativeLibraryByBaseName("clearkeycdmadapter");	81 MeasureSizeAndTimeToLoadNativeLibraryByBaseName("clearkeycdmadapter");

82 #endif // defined(OS_MACOSX)	82 #endif // defined(OS_MACOSX)

83 }	83 }

84 #endif // defined(ENABLE_PEPPER_CDMS)	84 #endif // defined(ENABLE_PEPPER_CDMS)

OLD	NEW