| OLD | NEW | 
|---|
| 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/renderer/renderer_main_platform_delegate.h" | 5 #include "content/renderer/renderer_main_platform_delegate.h" | 
| 6 | 6 | 
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" | 
| 8 #include "base/logging.h" | 8 #include "base/logging.h" | 
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" | 
| 10 #include "content/common/content_switches.h" | 10 #include "content/common/content_switches.h" | 
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 87     scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); | 87     scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); | 
| 88   } | 88   } | 
| 89 } | 89 } | 
| 90 | 90 | 
| 91 void RendererMainPlatformDelegate::PlatformUninitialize() { | 91 void RendererMainPlatformDelegate::PlatformUninitialize() { | 
| 92 } | 92 } | 
| 93 | 93 | 
| 94 bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { | 94 bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { | 
| 95   const CommandLine& command_line = parameters_.command_line_; | 95   const CommandLine& command_line = parameters_.command_line_; | 
| 96 | 96 | 
| 97   DVLOG(1) << "Started renderer with " << command_line.command_line_string(); | 97   DVLOG(1) << "Started renderer with " << command_line.GetCommandLineString(); | 
| 98 | 98 | 
| 99   sandbox::TargetServices* target_services = | 99   sandbox::TargetServices* target_services = | 
| 100       parameters_.sandbox_info_.TargetServices(); | 100       parameters_.sandbox_info_.TargetServices(); | 
| 101 | 101 | 
| 102   if (target_services && !no_sandbox) { | 102   if (target_services && !no_sandbox) { | 
| 103       std::wstring test_dll_name = | 103       std::wstring test_dll_name = | 
| 104           command_line.GetSwitchValueNative(switches::kTestSandbox); | 104           command_line.GetSwitchValueNative(switches::kTestSandbox); | 
| 105     if (!test_dll_name.empty()) { | 105     if (!test_dll_name.empty()) { | 
| 106       sandbox_test_module_ = LoadLibrary(test_dll_name.c_str()); | 106       sandbox_test_module_ = LoadLibrary(test_dll_name.c_str()); | 
| 107       DCHECK(sandbox_test_module_); | 107       DCHECK(sandbox_test_module_); | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
| 131                                                           kRenderTestCall)); | 131                                                           kRenderTestCall)); | 
| 132     DCHECK(run_security_tests); | 132     DCHECK(run_security_tests); | 
| 133     if (run_security_tests) { | 133     if (run_security_tests) { | 
| 134       int test_count = 0; | 134       int test_count = 0; | 
| 135       DVLOG(1) << "Running renderer security tests"; | 135       DVLOG(1) << "Running renderer security tests"; | 
| 136       BOOL result = run_security_tests(&test_count); | 136       BOOL result = run_security_tests(&test_count); | 
| 137       CHECK(result) << "Test number " << test_count << " has failed."; | 137       CHECK(result) << "Test number " << test_count << " has failed."; | 
| 138     } | 138     } | 
| 139   } | 139   } | 
| 140 } | 140 } | 
| OLD | NEW | 
|---|