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

Side by Side Diff: content/public/test/content_test_suite_base.cc

Issue 1164483003: Allow startup with missing V8 snapshot file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix misplaced ifdef for Windows Created 5 years, 6 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
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 "content/public/test/content_test_suite_base.h" 5 #include "content/public/test/content_test_suite_base.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/statistics_recorder.h" 10 #include "base/metrics/statistics_recorder.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void ContentTestSuiteBase::Initialize() { 67 void ContentTestSuiteBase::Initialize() {
68 base::TestSuite::Initialize(); 68 base::TestSuite::Initialize();
69 69
70 // Initialize the histograms subsystem, so that any histograms hit in tests 70 // Initialize the histograms subsystem, so that any histograms hit in tests
71 // are correctly registered with the statistics recorder and can be queried 71 // are correctly registered with the statistics recorder and can be queried
72 // by tests. 72 // by tests.
73 base::StatisticsRecorder::Initialize(); 73 base::StatisticsRecorder::Initialize();
74 74
75 #if !defined(OS_IOS) && defined(V8_USE_EXTERNAL_STARTUP_DATA) 75 #if !defined(OS_IOS) && defined(V8_USE_EXTERNAL_STARTUP_DATA)
76 gin::V8Initializer::LoadV8Snapshot(); 76 gin::V8Initializer::LoadV8Snapshot();
77 gin::V8Initializer::LoadV8Natives();
77 #endif 78 #endif
78 79
79 #if defined(OS_ANDROID) 80 #if defined(OS_ANDROID)
80 // Register JNI bindings for android. 81 // Register JNI bindings for android.
81 JNIEnv* env = base::android::AttachCurrentThread(); 82 JNIEnv* env = base::android::AttachCurrentThread();
82 content::android::RegisterCommonJni(env); 83 content::android::RegisterCommonJni(env);
83 content::android::RegisterBrowserJni(env); 84 content::android::RegisterBrowserJni(env);
84 gfx::android::RegisterJni(env); 85 gfx::android::RegisterJni(env);
85 media::RegisterJni(env); 86 media::RegisterJni(env);
86 net::android::RegisterJni(env); 87 net::android::RegisterJni(env);
(...skipping 24 matching lines...) Expand all
111 #if !defined(OS_IOS) 112 #if !defined(OS_IOS)
112 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( 113 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
113 CreateInProcessUtilityThread); 114 CreateInProcessUtilityThread);
114 RenderProcessHostImpl::RegisterRendererMainThreadFactory( 115 RenderProcessHostImpl::RegisterRendererMainThreadFactory(
115 CreateInProcessRendererThread); 116 CreateInProcessRendererThread);
116 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); 117 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
117 #endif 118 #endif
118 } 119 }
119 120
120 } // namespace content 121 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/shell/browser/shell_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698