summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-22 16:19:13 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-22 16:19:13 +0000
commite7afe2458ed03e907601cd3c05dc5f253f824d88 (patch)
tree1cf245de79837f358de6939d44df9f2a2d54fd01
parentac1894aec051033fc13bc41e1399ac05f5df3cc6 (diff)
downloadchromium_src-e7afe2458ed03e907601cd3c05dc5f253f824d88.zip
chromium_src-e7afe2458ed03e907601cd3c05dc5f253f824d88.tar.gz
chromium_src-e7afe2458ed03e907601cd3c05dc5f253f824d88.tar.bz2
Spelling correction: "nonexistant" -> "nonexistent".
BUG=none TEST=good spellers are slightly happier Review URL: http://codereview.chromium.org/3143037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57020 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--app/sql/connection.cc6
-rw-r--r--app/sql/connection_unittest.cc4
-rw-r--r--app/sql/transaction.cc6
-rw-r--r--base/file_util_unittest.cc2
-rw-r--r--chrome/browser/cancelable_request.h2
-rw-r--r--chrome/browser/extensions/extensions_service.cc4
-rw-r--r--chrome/browser/history/expire_history_backend_unittest.cc2
-rw-r--r--chrome/browser/history/url_database_unittest.cc18
-rw-r--r--chrome/browser/net/gaia/token_service_unittest.cc6
-rw-r--r--chrome/browser/net/predictor.cc2
-rw-r--r--chrome/browser/net/url_info.h4
-rw-r--r--chrome/browser/net/url_info_unittest.cc4
-rw-r--r--chrome/browser/webdata/web_data_service.cc4
13 files changed, 32 insertions, 32 deletions
diff --git a/app/sql/connection.cc b/app/sql/connection.cc
index 62ebfaf..c5f991f 100644
--- a/app/sql/connection.cc
+++ b/app/sql/connection.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -122,7 +122,7 @@ bool Connection::BeginTransaction() {
void Connection::RollbackTransaction() {
if (!transaction_nesting_) {
- NOTREACHED() << "Rolling back a nonexistant transaction";
+ NOTREACHED() << "Rolling back a nonexistent transaction";
return;
}
@@ -139,7 +139,7 @@ void Connection::RollbackTransaction() {
bool Connection::CommitTransaction() {
if (!transaction_nesting_) {
- NOTREACHED() << "Rolling back a nonexistant transaction";
+ NOTREACHED() << "Rolling back a nonexistent transaction";
return false;
}
transaction_nesting_--;
diff --git a/app/sql/connection_unittest.cc b/app/sql/connection_unittest.cc
index 5cd55a7..0a14a9a 100644
--- a/app/sql/connection_unittest.cc
+++ b/app/sql/connection_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -91,7 +91,7 @@ TEST_F(SQLConnectionTest, DoesStuffExist) {
EXPECT_FALSE(db().DoesColumnExist("foo", "bar"));
EXPECT_TRUE(db().DoesColumnExist("foo", "a"));
- // Testing for a column on a nonexistant table.
+ // Testing for a column on a nonexistent table.
EXPECT_FALSE(db().DoesColumnExist("bar", "b"));
}
diff --git a/app/sql/transaction.cc b/app/sql/transaction.cc
index 79a198b..10bcfb0 100644
--- a/app/sql/transaction.cc
+++ b/app/sql/transaction.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -30,7 +30,7 @@ bool Transaction::Begin() {
void Transaction::Rollback() {
if (!is_open_) {
- NOTREACHED() << "Attempting to roll back a nonexistant transaction. "
+ NOTREACHED() << "Attempting to roll back a nonexistent transaction. "
<< "Did you remember to call Begin() and check its return?";
return;
}
@@ -40,7 +40,7 @@ void Transaction::Rollback() {
bool Transaction::Commit() {
if (!is_open_) {
- NOTREACHED() << "Attempting to commit a nonexistant transaction. "
+ NOTREACHED() << "Attempting to commit a nonexistent transaction. "
<< "Did you remember to call Begin() and check its return?";
return false;
}
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index ec62b3c..f8eb38d 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -428,7 +428,7 @@ TEST_F(FileUtilTest, NormalizeFilePathBasic) {
ASSERT_FALSE(file_util::PathExists(file_a_path));
ASSERT_FALSE(file_util::NormalizeFilePath(file_a_path,
&normalized_file_a_path))
- << "NormalizeFilePath() should fail on nonexistant paths.";
+ << "NormalizeFilePath() should fail on nonexistent paths.";
CreateTextFile(file_a_path, bogus_content);
ASSERT_TRUE(file_util::PathExists(file_a_path));
diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h
index edbe817..1365a26 100644
--- a/chrome/browser/cancelable_request.h
+++ b/chrome/browser/cancelable_request.h
@@ -297,7 +297,7 @@ class CancelableRequestConsumerTSimple : public CancelableRequestConsumerBase {
typename PendingRequestList::iterator i =
pending_requests_.find(PendingRequest(provider, handle));
if (i == pending_requests_.end()) {
- NOTREACHED() << "Got a complete notification for a nonexistant request";
+ NOTREACHED() << "Got a complete notification for a nonexistent request";
return;
}
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 58ead19..e055f61 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -406,7 +406,7 @@ void ExtensionsService::UninstallExtension(const std::string& extension_id,
bool external_uninstall) {
Extension* extension = GetExtensionByIdInternal(extension_id, true, true);
- // Callers should not send us nonexistant extensions.
+ // Callers should not send us nonexistent extensions.
DCHECK(extension);
// Notify interested parties that we're uninstalling this extension.
@@ -901,7 +901,7 @@ void ExtensionsService::UnloadExtension(const std::string& extension_id) {
scoped_ptr<Extension> extension(
GetExtensionByIdInternal(extension_id, true, true));
- // Callers should not send us nonexistant extensions.
+ // Callers should not send us nonexistent extensions.
CHECK(extension.get());
// Keep information about the extension so that we can reload it later
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index ef65eab..91129ed 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -891,7 +891,7 @@ TEST_F(ExpireHistoryTest, ArchiveSomeOldHistoryWithSource) {
}
// TODO(brettw) add some visits with no URL to make sure everything is updated
-// properly. Have the visits also refer to nonexistant FTS rows.
+// properly. Have the visits also refer to nonexistent FTS rows.
//
// Maybe also refer to invalid favicons.
diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc
index 32ded0c..f567844 100644
--- a/chrome/browser/history/url_database_unittest.cc
+++ b/chrome/browser/history/url_database_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -67,9 +67,9 @@ class URLDatabaseTest : public testing::Test,
sql::Connection db_;
};
-// Test add and query for the URL table in the HistoryDatabase
+// Test add and query for the URL table in the HistoryDatabase.
TEST_F(URLDatabaseTest, AddURL) {
- // first, add two URLs
+ // First, add two URLs.
const GURL url1("http://www.google.com/");
URLRow url_info1(url1);
url_info1.set_title(UTF8ToUTF16("Google"));
@@ -88,7 +88,7 @@ TEST_F(URLDatabaseTest, AddURL) {
url_info2.set_hidden(true);
EXPECT_TRUE(AddURL(url_info2));
- // query both of them
+ // Query both of them.
URLRow info;
EXPECT_TRUE(GetRowForURL(url1, &info));
EXPECT_TRUE(IsURLRowEqual(url_info1, info));
@@ -96,7 +96,7 @@ TEST_F(URLDatabaseTest, AddURL) {
EXPECT_TRUE(id2);
EXPECT_TRUE(IsURLRowEqual(url_info2, info));
- // update the second
+ // Update the second.
url_info2.set_title(UTF8ToUTF16("Google Mail Too"));
url_info2.set_visit_count(4);
url_info2.set_typed_count(1);
@@ -104,19 +104,19 @@ TEST_F(URLDatabaseTest, AddURL) {
url_info2.set_hidden(false);
EXPECT_TRUE(UpdateURLRow(id2, url_info2));
- // make sure it got updated
+ // Make sure it got updated.
URLRow info2;
EXPECT_TRUE(GetRowForURL(url2, &info2));
EXPECT_TRUE(IsURLRowEqual(url_info2, info2));
- // query a nonexistant URL
+ // Query a nonexistent URL.
EXPECT_EQ(0, GetRowForURL(GURL("http://news.google.com/"), &info));
- // Delete all urls in the domain
+ // Delete all urls in the domain.
// TODO(acw): test the new url based delete domain
// EXPECT_TRUE(db.DeleteDomain(kDomainID));
- // Make sure the urls have been properly removed
+ // Make sure the urls have been properly removed.
// TODO(acw): commented out because remove no longer works.
// EXPECT_TRUE(db.GetURLInfo(url1, NULL) == NULL);
// EXPECT_TRUE(db.GetURLInfo(url2, NULL) == NULL);
diff --git a/chrome/browser/net/gaia/token_service_unittest.cc b/chrome/browser/net/gaia/token_service_unittest.cc
index b829191..512efff 100644
--- a/chrome/browser/net/gaia/token_service_unittest.cc
+++ b/chrome/browser/net/gaia/token_service_unittest.cc
@@ -130,12 +130,12 @@ class TokenServiceTest : public testing::Test {
TEST_F(TokenServiceTest, SanityCheck) {
EXPECT_TRUE(service_.HasLsid());
EXPECT_EQ(service_.GetLsid(), "lsid");
- EXPECT_FALSE(service_.HasTokenForService("nonexistant service"));
+ EXPECT_FALSE(service_.HasTokenForService("nonexistent service"));
}
TEST_F(TokenServiceTest, NoToken) {
- EXPECT_FALSE(service_.HasTokenForService("nonexistant service"));
- EXPECT_EQ(service_.GetTokenForService("nonexistant service"), std::string());
+ EXPECT_FALSE(service_.HasTokenForService("nonexistent service"));
+ EXPECT_EQ(service_.GetTokenForService("nonexistent service"), std::string());
}
TEST_F(TokenServiceTest, NotificationSuccess) {
diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
index 1602cc1..5e55ee2 100644
--- a/chrome/browser/net/predictor.cc
+++ b/chrome/browser/net/predictor.cc
@@ -392,7 +392,7 @@ void Predictor::GetHtmlInfo(std::string* output) {
// Partition the UrlInfo's into categories.
for (SortedUrlInfo::iterator it(snapshot.begin());
it != snapshot.end(); it++) {
- if (it->second.was_nonexistant()) {
+ if (it->second.was_nonexistent()) {
name_not_found.push_back(it->second);
continue;
}
diff --git a/chrome/browser/net/url_info.h b/chrome/browser/net/url_info.h
index eea0e6e..4ef5a7c 100644
--- a/chrome/browser/net/url_info.h
+++ b/chrome/browser/net/url_info.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -110,7 +110,7 @@ class UrlInfo {
}
bool was_found() const { return FOUND == state_; }
- bool was_nonexistant() const { return NO_SUCH_NAME == state_; }
+ bool was_nonexistent() const { return NO_SUCH_NAME == state_; }
bool is_assigned() const {
return ASSIGNED == state_ || ASSIGNED_BUT_MARKED == state_;
}
diff --git a/chrome/browser/net/url_info_unittest.cc b/chrome/browser/net/url_info_unittest.cc
index 3126cb9..29f65cf 100644
--- a/chrome/browser/net/url_info_unittest.cc
+++ b/chrome/browser/net/url_info_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -106,7 +106,7 @@ TEST(DnsHostInfoTest, CongestionResetStateTest) {
// Since this was a new info instance, and it never got resolved, we land back
// in a PENDING state rather than FOUND or NO_SUCH_NAME.
EXPECT_FALSE(info.was_found());
- EXPECT_FALSE(info.was_nonexistant());
+ EXPECT_FALSE(info.was_nonexistent());
// Make sure we're completely re-usable, by going throug a normal flow.
info.SetQueuedState(UrlInfo::UNIT_TEST_MOTIVATED);
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 63b5da0..b889d10 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -70,7 +70,7 @@ void WebDataService::CancelRequest(Handle h) {
AutoLock l(pending_lock_);
RequestMap::iterator i = pending_requests_.find(h);
if (i == pending_requests_.end()) {
- NOTREACHED() << "Canceling a nonexistant web data service request";
+ NOTREACHED() << "Canceling a nonexistent web data service request";
return;
}
i->second->Cancel();