chrome/browser/child_process_launcher.cc - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/child_process_launcher.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/child_process_launcher.cc

diff --git a/chrome/browser/child_process_launcher.cc b/chrome/browser/child_process_launcher.cc

index 6058cc8cd71fb22c8cea23c661cbb1af1546ea32..598bbeff9e7c5bce6ff721c98124dc328b420510 100644

--- a/chrome/browser/child_process_launcher.cc

+++ b/chrome/browser/child_process_launcher.cc

@@ -7,9 +7,9 @@

#include <utility> // For std::pair.

#include "base/command_line.h"

-#include "base/lock.h"

#include "base/logging.h"

#include "base/scoped_ptr.h"

+#include "base/synchronization/lock.h"

#include "base/threading/thread.h"

#include "chrome/browser/browser_thread.h"

#include "chrome/common/chrome_descriptors.h"

@@ -174,7 +174,7 @@ class ChildProcessLauncher::Context

// AddPlaceholderForPid(), enabling proper cleanup.

{ // begin scope for AutoLock

MachBroker* broker = MachBroker::GetInstance();

- AutoLock lock(broker->GetLock());

+ base::AutoLock lock(broker->GetLock());

// This call to |PrepareForFork()| will start the MachBroker listener

// thread, if it is not already running. Therefore the browser process

« no previous file with comments | « chrome/browser/cert_store.cc ('k') | chrome/browser/child_process_security_policy.h » ('j') | no next file with comments »