diff options
Diffstat (limited to 'content')
29 files changed, 47 insertions, 46 deletions
diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc index 7666842..5327c1d 100644 --- a/content/browser/browser_child_process_host.cc +++ b/content/browser/browser_child_process_host.cc @@ -35,8 +35,8 @@ using content::BrowserThread; namespace { typedef std::list<BrowserChildProcessHost*> ChildProcessList; -static base::LazyInstance<ChildProcessList> g_child_process_list( - base::LINKER_INITIALIZED); +static base::LazyInstance<ChildProcessList> g_child_process_list = + LAZY_INSTANCE_INITIALIZER; // The NotificationTask is used to notify about plugin process connection/ // disconnection. It is needed because the notifications in the diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc index d964af0..023259b 100644 --- a/content/browser/browser_thread_impl.cc +++ b/content/browser/browser_thread_impl.cc @@ -36,7 +36,7 @@ namespace { // without holding this lock. Do not block while holding this lock. base::LazyInstance<base::Lock, base::LeakyLazyInstanceTraits<base::Lock> > - g_lock(base::LINKER_INITIALIZED); + g_lock = LAZY_INSTANCE_INITIALIZER; // An array of the BrowserThread objects. This array is protected by |g_lock|. diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index eec9d8d..6ba5a39 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -17,7 +17,8 @@ base::LazyInstance< BrowsingInstance::ContextSiteInstanceMap, base::LeakyLazyInstanceTraits<BrowsingInstance::ContextSiteInstanceMap> > - BrowsingInstance::context_site_instance_map_(base::LINKER_INITIALIZED); + BrowsingInstance::context_site_instance_map_ = + LAZY_INSTANCE_INITIALIZER; BrowsingInstance::BrowsingInstance(content::BrowserContext* browser_context) : browser_context_(browser_context) { diff --git a/content/browser/debugger/devtools_client_host.cc b/content/browser/debugger/devtools_client_host.cc index 3250dc8..3ff2c54 100644 --- a/content/browser/debugger/devtools_client_host.cc +++ b/content/browser/debugger/devtools_client_host.cc @@ -13,7 +13,7 @@ typedef std::vector<DevToolsClientHost*> DevToolsClientHostList; namespace { base::LazyInstance<DevToolsClientHostList, base::LeakyLazyInstanceTraits<DevToolsClientHostList> > - g_instances(base::LINKER_INITIALIZED); + g_instances = LAZY_INSTANCE_INITIALIZER; } // namespace // static diff --git a/content/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc index 4d654d2..61b96e2 100644 --- a/content/browser/debugger/devtools_http_protocol_handler.cc +++ b/content/browser/debugger/devtools_http_protocol_handler.cc @@ -136,11 +136,11 @@ class TabContentsIDHelper : public TabContentsObserver { base::LazyInstance< TabContentsIDHelper::IdToTabContentsMap, base::LeakyLazyInstanceTraits<TabContentsIDHelper::IdToTabContentsMap> > - TabContentsIDHelper::id_to_tabcontents_(base::LINKER_INITIALIZED); + TabContentsIDHelper::id_to_tabcontents_ = LAZY_INSTANCE_INITIALIZER; base::LazyInstance< TabContentsIDHelper::TabContentsToIdMap, base::LeakyLazyInstanceTraits<TabContentsIDHelper::TabContentsToIdMap> > - TabContentsIDHelper::tabcontents_to_id_(base::LINKER_INITIALIZED); + TabContentsIDHelper::tabcontents_to_id_ = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/content/browser/debugger/render_view_devtools_agent_host.cc b/content/browser/debugger/render_view_devtools_agent_host.cc index 8985b67..99dc4d0 100644 --- a/content/browser/debugger/render_view_devtools_agent_host.cc +++ b/content/browser/debugger/render_view_devtools_agent_host.cc @@ -22,7 +22,7 @@ typedef std::map<RenderViewHost*, RenderViewDevToolsAgentHost*> Instances; namespace { base::LazyInstance<Instances, base::LeakyLazyInstanceTraits<Instances> > - g_instances(base::LINKER_INITIALIZED); + g_instances = LAZY_INSTANCE_INITIALIZER; } // namespace DevToolsAgentHost* RenderViewDevToolsAgentHost::FindFor( diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 5e7cb43..c7b952b 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -49,8 +49,8 @@ enum GPUProcessLifetimeEvent { }; // A global map from GPU process host ID to GpuProcessHost. -static base::LazyInstance<IDMap<GpuProcessHost> > g_hosts_by_id( - base::LINKER_INITIALIZED); +static base::LazyInstance<IDMap<GpuProcessHost> > g_hosts_by_id = + LAZY_INSTANCE_INITIALIZER; // Number of times the gpu process has crashed in the current browser session. static int g_gpu_crash_count = 0; @@ -593,7 +593,6 @@ bool GpuProcessHost::LaunchGpuProcess() { switches::kGpuStartupDialog, switches::kLoggingLevel, switches::kNoSandbox, - switches::kTraceStartup, }; cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, arraysize(kSwitchNames)); diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc index d6f9830..de484b3 100644 --- a/content/browser/gpu/gpu_process_host_ui_shim.cc +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc @@ -35,8 +35,8 @@ namespace { #undef DestroyAll #endif -base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id( - base::LINKER_INITIALIZED); +base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id = + LAZY_INSTANCE_INITIALIZER; class SendOnIOThreadTask : public Task { public: diff --git a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc index 7a50f3a..7580c18 100644 --- a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc +++ b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc @@ -108,8 +108,8 @@ class KeyUtilityClientImpl // IndexedDBKeyUtilityClient definitions. -static base::LazyInstance<IndexedDBKeyUtilityClient> client_instance( - base::LINKER_INITIALIZED); +static base::LazyInstance<IndexedDBKeyUtilityClient> client_instance = + LAZY_INSTANCE_INITIALIZER; IndexedDBKeyUtilityClient::IndexedDBKeyUtilityClient() : is_shutdown_(false) { diff --git a/content/browser/mock_resource_context.cc b/content/browser/mock_resource_context.cc index 2406273..3d8b4dd 100644 --- a/content/browser/mock_resource_context.cc +++ b/content/browser/mock_resource_context.cc @@ -10,7 +10,7 @@ namespace content { static base::LazyInstance<MockResourceContext> - g_mock_resource_context(base::LINKER_INITIALIZED); + g_mock_resource_context = LAZY_INSTANCE_INITIALIZER; MockResourceContext* MockResourceContext::GetInstance() { return &g_mock_resource_context.Get(); diff --git a/content/browser/net/url_request_slow_download_job.cc b/content/browser/net/url_request_slow_download_job.cc index 562bb06..bb650f8 100644 --- a/content/browser/net/url_request_slow_download_job.cc +++ b/content/browser/net/url_request_slow_download_job.cc @@ -32,7 +32,8 @@ const int URLRequestSlowDownloadJob::kSecondDownloadSize = 1024 * 10; base::LazyInstance< URLRequestSlowDownloadJob::SlowJobsSet, base::LeakyLazyInstanceTraits<URLRequestSlowDownloadJob::SlowJobsSet> > - URLRequestSlowDownloadJob::pending_requests_(base::LINKER_INITIALIZED); + URLRequestSlowDownloadJob::pending_requests_ = + LAZY_INSTANCE_INITIALIZER; void URLRequestSlowDownloadJob::Start() { MessageLoop::current()->PostTask( diff --git a/content/browser/notification_service_impl.cc b/content/browser/notification_service_impl.cc index 795cb30..221a883 100644 --- a/content/browser/notification_service_impl.cc +++ b/content/browser/notification_service_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "content/public/browser/notification_types.h" static base::LazyInstance<base::ThreadLocalPointer<NotificationServiceImpl> > - lazy_tls_ptr(base::LINKER_INITIALIZED); + lazy_tls_ptr = LAZY_INSTANCE_INITIALIZER; // static NotificationServiceImpl* NotificationServiceImpl::current() { diff --git a/content/browser/renderer_host/image_transport_client.cc b/content/browser/renderer_host/image_transport_client.cc index 7ced869..0235b96 100644 --- a/content/browser/renderer_host/image_transport_client.cc +++ b/content/browser/renderer_host/image_transport_client.cc @@ -216,8 +216,8 @@ class ImageTransportClientGLX : public ImageTransportClient { static base::LazyInstance<GLXFBConfig> fbconfig_; }; -base::LazyInstance<GLXFBConfig> ImageTransportClientGLX::fbconfig_( - base::LINKER_INITIALIZED); +base::LazyInstance<GLXFBConfig> ImageTransportClientGLX::fbconfig_ = + LAZY_INSTANCE_INITIALIZER; class ImageTransportClientOSMesa : public ImageTransportClient { public: diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.cc b/content/browser/renderer_host/java/java_bridge_channel_host.cc index d8476c8..1d21413 100644 --- a/content/browser/renderer_host/java/java_bridge_channel_host.cc +++ b/content/browser/renderer_host/java/java_bridge_channel_host.cc @@ -19,8 +19,8 @@ struct WaitableEventLazyInstanceTraits return new (instance) WaitableEvent(false, false); } }; -base::LazyInstance<WaitableEvent, WaitableEventLazyInstanceTraits> dummy_event( - base::LINKER_INITIALIZED); +base::LazyInstance<WaitableEvent, WaitableEventLazyInstanceTraits> dummy_event = + LAZY_INSTANCE_INITIALIZER; } JavaBridgeChannelHost* JavaBridgeChannelHost::GetJavaBridgeChannelHost( diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc index 73b411e..c405961 100644 --- a/content/browser/renderer_host/render_process_host.cc +++ b/content/browser/renderer_host/render_process_host.cc @@ -85,7 +85,7 @@ static bool IsSuitableHost(RenderProcessHost* host, // the global list of all renderer processes base::LazyInstance<IDMap<RenderProcessHost>, base::LeakyLazyInstanceTraits<IDMap<RenderProcessHost> > > - g_all_hosts(base::LINKER_INITIALIZED); + g_all_hosts = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/content/browser/speech/speech_input_dispatcher_host.cc b/content/browser/speech/speech_input_dispatcher_host.cc index aacb90a3..49273a5 100644 --- a/content/browser/speech/speech_input_dispatcher_host.cc +++ b/content/browser/speech/speech_input_dispatcher_host.cc @@ -49,7 +49,7 @@ class SpeechInputDispatcherHost::SpeechInputCallers { }; static base::LazyInstance<SpeechInputDispatcherHost::SpeechInputCallers> - g_speech_input_callers(base::LINKER_INITIALIZED); + g_speech_input_callers = LAZY_INSTANCE_INITIALIZER; SpeechInputDispatcherHost::SpeechInputCallers::SpeechInputCallers() : next_id_(1) { diff --git a/content/common/net/url_fetcher_impl.cc b/content/common/net/url_fetcher_impl.cc index cbac732..87e9196 100644 --- a/content/common/net/url_fetcher_impl.cc +++ b/content/common/net/url_fetcher_impl.cc @@ -316,7 +316,7 @@ void URLFetcherImpl::Core::Registry::CancelAll() { // static base::LazyInstance<URLFetcherImpl::Core::Registry> - URLFetcherImpl::Core::g_registry(base::LINKER_INITIALIZED); + URLFetcherImpl::Core::g_registry = LAZY_INSTANCE_INITIALIZER; URLFetcherImpl::Core::TempFileWriter::TempFileWriter( URLFetcherImpl::Core* core, diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc index 62ea1e2..7b72119 100644 --- a/content/common/np_channel_base.cc +++ b/content/common/np_channel_base.cc @@ -19,12 +19,12 @@ typedef base::hash_map<std::string, scoped_refptr<NPChannelBase> > ChannelMap; static base::LazyInstance<ChannelMap, base::LeakyLazyInstanceTraits<ChannelMap> > - g_channels(base::LINKER_INITIALIZED); + g_channels = LAZY_INSTANCE_INITIALIZER; typedef std::stack<scoped_refptr<NPChannelBase> > NPChannelRefStack; static base::LazyInstance<NPChannelRefStack, base::LeakyLazyInstanceTraits<NPChannelRefStack> > - g_lazy_channel_stack(base::LINKER_INITIALIZED); + g_lazy_channel_stack = LAZY_INSTANCE_INITIALIZER; static int next_pipe_id = 0; diff --git a/content/common/socket_stream_dispatcher.cc b/content/common/socket_stream_dispatcher.cc index 6ee499e..79961b8 100644 --- a/content/common/socket_stream_dispatcher.cc +++ b/content/common/socket_stream_dispatcher.cc @@ -67,7 +67,7 @@ class IPCWebSocketStreamHandleBridge base::LazyInstance< IDMap<IPCWebSocketStreamHandleBridge>, base::LeakyLazyInstanceTraits<IDMap<IPCWebSocketStreamHandleBridge> > > - IPCWebSocketStreamHandleBridge::all_bridges(base::LINKER_INITIALIZED); + IPCWebSocketStreamHandleBridge::all_bridges = LAZY_INSTANCE_INITIALIZER; /* static */ IPCWebSocketStreamHandleBridge* IPCWebSocketStreamHandleBridge::FromSocketId( diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index 7951a8f..f4de8be 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -65,8 +65,8 @@ class EnsureTerminateMessageFilter : public IPC::ChannelProxy::MessageFilter { } // namespace -static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls( - base::LINKER_INITIALIZED); +static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls = + LAZY_INSTANCE_INITIALIZER; PluginThread::PluginThread() : preloaded_plugin_module_(NULL) { diff --git a/content/public/renderer/render_thread.cc b/content/public/renderer/render_thread.cc index ea04fd2..ef04a50 100644 --- a/content/public/renderer/render_thread.cc +++ b/content/public/renderer/render_thread.cc @@ -11,8 +11,8 @@ namespace content { // Keep the global RenderThread in a TLS slot so it is impossible to access // incorrectly from the wrong thread. -static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls( - base::LINKER_INITIALIZED); +static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls = + LAZY_INSTANCE_INITIALIZER; RenderThread* RenderThread::Get() { return lazy_tls.Pointer()->Get(); diff --git a/content/public/renderer/render_view_observer_tracker.h b/content/public/renderer/render_view_observer_tracker.h index 5f719d1..4ea322b 100644 --- a/content/public/renderer/render_view_observer_tracker.h +++ b/content/public/renderer/render_view_observer_tracker.h @@ -61,7 +61,7 @@ class RenderViewObserverTracker { template <class T> base::LazyInstance<std::map<const RenderView*, T*> > - RenderViewObserverTracker<T>::render_view_map_(base::LINKER_INITIALIZED); + RenderViewObserverTracker<T>::render_view_map_ = LAZY_INSTANCE_INITIALIZER; } // namespace content diff --git a/content/public/utility/utility_thread.cc b/content/public/utility/utility_thread.cc index 4da5bfb..bc4bd30 100644 --- a/content/public/utility/utility_thread.cc +++ b/content/public/utility/utility_thread.cc @@ -11,8 +11,8 @@ namespace content { // Keep the global UtilityThread in a TLS slot so it is impossible to access // incorrectly from the wrong thread. -static base::LazyInstance<base::ThreadLocalPointer<UtilityThread> > lazy_tls( - base::LINKER_INITIALIZED); +static base::LazyInstance<base::ThreadLocalPointer<UtilityThread> > lazy_tls = + LAZY_INSTANCE_INITIALIZER; UtilityThread* UtilityThread::Get() { return lazy_tls.Pointer()->Get(); diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc index cedb9d2..01041e7 100644 --- a/content/renderer/devtools_agent.cc +++ b/content/renderer/devtools_agent.cc @@ -54,7 +54,7 @@ class WebKitClientMessageLoopImpl typedef std::map<int, DevToolsAgent*> IdToAgentMap; base::LazyInstance<IdToAgentMap, base::LeakyLazyInstanceTraits<IdToAgentMap> > - g_agent_for_routing_id(base::LINKER_INITIALIZED); + g_agent_for_routing_id = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/content/renderer/gpu/renderer_gl_context.cc b/content/renderer/gpu/renderer_gl_context.cc index 4bf402d..03f6715 100644 --- a/content/renderer/gpu/renderer_gl_context.cc +++ b/content/renderer/gpu/renderer_gl_context.cc @@ -52,8 +52,8 @@ class GLES2Initializer { //////////////////////////////////////////////////////////////////////////////// -static base::LazyInstance<GLES2Initializer> g_gles2_initializer( - base::LINKER_INITIALIZED); +static base::LazyInstance<GLES2Initializer> g_gles2_initializer = + LAZY_INSTANCE_INITIALIZER; //////////////////////////////////////////////////////////////////////////////// diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc index 39dfc04..78584c9 100644 --- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc @@ -37,9 +37,9 @@ static base::LazyInstance<base::Lock, base::LeakyLazyInstanceTraits<base::Lock> > - g_all_shared_contexts_lock(base::LINKER_INITIALIZED); + g_all_shared_contexts_lock = LAZY_INSTANCE_INITIALIZER; static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> > - g_all_shared_contexts(base::LINKER_INITIALIZED); + g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER; WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl() : initialize_failed_(false), diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index ea8f8ff..a47ea0c 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -108,8 +108,8 @@ static const int kPopupListBoxMinimumRowHeight = 60; // Keep the global RenderThreadImpl in a TLS slot so it is impossible to access // incorrectly from the wrong thread. -static base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> > lazy_tls( - base::LINKER_INITIALIZED); +static base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> > + lazy_tls = LAZY_INSTANCE_INITIALIZER; class RenderViewZoomer : public content::RenderViewVisitor { public: diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 1c6ac4b..80ea6e2 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -251,7 +251,7 @@ using webkit_glue::ResourceFetcher; //----------------------------------------------------------------------------- typedef std::map<WebKit::WebView*, RenderViewImpl*> ViewMap; -static base::LazyInstance<ViewMap> g_view_map(base::LINKER_INITIALIZED); +static base::LazyInstance<ViewMap> g_view_map = LAZY_INSTANCE_INITIALIZER; // Time, in seconds, we delay before sending content state changes (such as form // state and scroll position) to the browser. We delay sending changes to avoid diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc index 3d05e49..b26cf32 100644 --- a/content/worker/worker_thread.cc +++ b/content/worker/worker_thread.cc @@ -23,8 +23,8 @@ using WebKit::WebRuntimeFeatures; -static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls( - base::LINKER_INITIALIZED); +static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls = + LAZY_INSTANCE_INITIALIZER; WorkerThread::WorkerThread() { |