chrome/browser/sync/engine/net/server_connection_manager.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/sync/engine/net/server_connection_manager.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/sync/engine/net/server_connection_manager.cc

diff --git a/chrome/browser/sync/engine/net/server_connection_manager.cc b/chrome/browser/sync/engine/net/server_connection_manager.cc

index 20776fe5f3b1b70b7a51b1114460277e7980ffd1..7f53a29dd8a23564ff4803d22f8d936bdf2e73a7 100644

--- a/chrome/browser/sync/engine/net/server_connection_manager.cc

+++ b/chrome/browser/sync/engine/net/server_connection_manager.cc

@@ -255,7 +255,7 @@ bool ServerConnectionManager::CheckServerReachable() {

void ServerConnectionManager::kill() {

{

- AutoLock lock(terminate_all_io_mutex_);

+ base::AutoLock lock(terminate_all_io_mutex_);

terminate_all_io_ = true;

}

@@ -294,7 +294,7 @@ void ServerConnectionManager::SetServerParameters(const string& server_url,

int port,

bool use_ssl) {

{

- AutoLock lock(server_parameters_mutex_);

+ base::AutoLock lock(server_parameters_mutex_);

sync_server_ = server_url;

sync_server_port_ = port;

use_ssl_ = use_ssl;

@@ -305,7 +305,7 @@ void ServerConnectionManager::SetServerParameters(const string& server_url,

void ServerConnectionManager::GetServerParameters(string* server_url,

int* port,

bool* use_ssl) const {

- AutoLock lock(server_parameters_mutex_);

+ base::AutoLock lock(server_parameters_mutex_);

if (server_url != NULL)

*server_url = sync_server_;

if (port != NULL)

« no previous file with comments | « chrome/browser/sync/engine/net/server_connection_manager.h ('k') | chrome/browser/sync/engine/syncapi.cc » ('j') | no next file with comments »