Merge Chromium at r12.0.742.93: Initial merge by git

Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6

1 files changed, 4 insertions, 4 deletions

diff --git a/base/path_service.cc b/base/path_service.cc
index 117feb5..e72ae7d 100644
--- a/base/path_service.cc
+++ b/base/path_service.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -171,7 +171,7 @@ bool PathService::Get(int key, FilePath* result) {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
   DCHECK(result);
-  DCHECK(key >= base::DIR_CURRENT);
+  DCHECK_GE(key, base::DIR_CURRENT);
 
   // special case the current directory because it can never be cached
   if (key == base::DIR_CURRENT)
@@ -208,7 +208,7 @@ bool PathService::Get(int key, FilePath* result) {
 bool PathService::Override(int key, const FilePath& path) {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
-  DCHECK(key > base::DIR_CURRENT) << "invalid path key";
+  DCHECK_GT(key, base::DIR_CURRENT) << "invalid path key";
 
   FilePath file_path = path;
 
@@ -241,7 +241,7 @@ void PathService::RegisterProvider(ProviderFunc func, int key_start,
                                    int key_end) {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
-  DCHECK(key_end > key_start);
+  DCHECK_GT(key_end, key_start);
 
   base::AutoLock scoped_lock(path_data->lock);