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

Side by Side Diff: content/common/plugin_list_posix.cc

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/common/plugin_list.h" 5 #include "content/common/plugin_list.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <dlfcn.h> 8 #include <dlfcn.h>
9 #if defined(OS_OPENBSD) 9 #if defined(OS_OPENBSD)
10 #include <sys/exec_elf.h> 10 #include <sys/exec_elf.h>
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 }; 108 };
109 109
110 int64 size; 110 int64 size;
111 if (!file_util::GetFileSize(path, &size)) 111 if (!file_util::GetFileSize(path, &size))
112 return false; 112 return false;
113 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(bad_entries); i++) { 113 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(bad_entries); i++) {
114 if (bad_entries[i].size != size) 114 if (bad_entries[i].size != size)
115 continue; 115 continue;
116 116
117 std::string file_content; 117 std::string file_content;
118 if (!file_util::ReadFileToString(path, &file_content)) 118 if (!base::ReadFileToString(path, &file_content))
119 continue; 119 continue;
120 std::string sha1 = base::SHA1HashString(file_content); 120 std::string sha1 = base::SHA1HashString(file_content);
121 std::string sha1_readable; 121 std::string sha1_readable;
122 for (size_t j = 0; j < sha1.size(); j++) 122 for (size_t j = 0; j < sha1.size(); j++)
123 base::StringAppendF(&sha1_readable, "%02x", sha1[j] & 0xFF); 123 base::StringAppendF(&sha1_readable, "%02x", sha1[j] & 0xFF);
124 if (bad_entries[i].sha1 == sha1_readable) 124 if (bad_entries[i].sha1 == sha1_readable)
125 return CheckQuirks(bad_entries[i].quirks); 125 return CheckQuirks(bad_entries[i].quirks);
126 } 126 }
127 return false; 127 return false;
128 } 128 }
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 } 584 }
585 585
586 // TODO(evanm): prefer the newest version of flash, etc. here? 586 // TODO(evanm): prefer the newest version of flash, etc. here?
587 587
588 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value(); 588 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
589 589
590 return true; 590 return true;
591 } 591 }
592 592
593 } // namespace content 593 } // namespace content
OLDNEW
« no previous file with comments | « content/common/page_state_serialization_unittest.cc ('k') | content/common/sandbox_mac_fontloading_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698