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

Side by Side Diff: chrome/test/base/chrome_test_suite.cc

Issue 10786038: Prevent loading libffmpegsumo.so to python (autotests) process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync + iteration Created 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/base/chrome_test_suite.h" 5 #include "chrome/test/base/chrome_test_suite.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/metrics/stats_table.h" 10 #include "base/metrics/stats_table.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 #endif 166 #endif
167 167
168 chrome::RegisterPathProvider(); 168 chrome::RegisterPathProvider();
169 if (!browser_dir_.empty()) { 169 if (!browser_dir_.empty()) {
170 PathService::Override(base::DIR_EXE, browser_dir_); 170 PathService::Override(base::DIR_EXE, browser_dir_);
171 PathService::Override(base::DIR_MODULE, browser_dir_); 171 PathService::Override(base::DIR_MODULE, browser_dir_);
172 } 172 }
173 173
174 // Initialize after overriding paths as some content paths depend on correct 174 // Initialize after overriding paths as some content paths depend on correct
175 // values for DIR_EXE and DIR_MODULE. 175 // values for DIR_EXE and DIR_MODULE.
176 content::ContentTestSuiteBase::DisableLoadingExternalLibraries();
jam 2012/07/23 23:02:40 now you're doing this for all chrome test suites,
glotov 2012/07/24 13:06:55 Done.
176 content::ContentTestSuiteBase::Initialize(); 177 content::ContentTestSuiteBase::Initialize();
177 178
178 #if defined(OS_MACOSX) 179 #if defined(OS_MACOSX)
179 // Look in the framework bundle for resources. 180 // Look in the framework bundle for resources.
180 FilePath path; 181 FilePath path;
181 PathService::Get(base::DIR_EXE, &path); 182 PathService::Get(base::DIR_EXE, &path);
182 path = path.Append(chrome::kFrameworkName); 183 path = path.Append(chrome::kFrameworkName);
183 base::mac::SetOverrideFrameworkBundlePath(path); 184 base::mac::SetOverrideFrameworkBundlePath(path);
184 #endif 185 #endif
185 186
(...skipping 28 matching lines...) Expand all
214 #if defined(OS_MACOSX) 215 #if defined(OS_MACOSX)
215 base::mac::SetOverrideFrameworkBundle(NULL); 216 base::mac::SetOverrideFrameworkBundle(NULL);
216 #endif 217 #endif
217 218
218 base::StatsTable::set_current(NULL); 219 base::StatsTable::set_current(NULL);
219 stats_table_.reset(); 220 stats_table_.reset();
220 RemoveSharedMemoryFile(stats_filename_); 221 RemoveSharedMemoryFile(stats_filename_);
221 222
222 base::TestSuite::Shutdown(); 223 base::TestSuite::Shutdown();
223 } 224 }
OLDNEW
« no previous file with comments | « no previous file | content/public/test/content_test_suite_base.h » ('j') | content/public/test/content_test_suite_base.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698