diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:12:15 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:12:15 +0000 |
| commit | 1cb92b82067bc2ed57f41aee7eb39269df91f4f0 (patch) | |
| tree | 164b4dc81a5a023a51ed39f474eb4cb8ee616b60 /chrome/browser/net/url_fixer_upper.cc | |
| parent | d36bd7aa0aa6b19f629bfc983519d34a450fa767 (diff) | |
| download | chromium_src-1cb92b82067bc2ed57f41aee7eb39269df91f4f0.zip chromium_src-1cb92b82067bc2ed57f41aee7eb39269df91f4f0.tar.gz chromium_src-1cb92b82067bc2ed57f41aee7eb39269df91f4f0.tar.bz2 | |
chrome 3: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/671014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/url_fixer_upper.cc')
| -rw-r--r-- | chrome/browser/net/url_fixer_upper.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index cc85420..e5dc12a 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -9,6 +9,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_file.h" @@ -200,8 +201,8 @@ static void AddDesiredTLD(const string& desired_tld, // Add the suffix at the end of the domain. const size_t domain_length(domain->length()); - DCHECK(domain_length > 0); - DCHECK(desired_tld[0] != '.'); + DCHECK_GT(domain_length, 0U); + DCHECK_NE(desired_tld[0], '.'); if ((*domain)[domain_length - 1] != '.') domain->push_back('.'); domain->append(desired_tld); @@ -255,7 +256,7 @@ static void FixupHost(const string& text, domain.erase(0, first_nondot); size_t last_nondot(domain.find_last_not_of('.')); DCHECK(last_nondot != string::npos); - last_nondot += 2; // Point at second period in ending string + last_nondot += 2; // Point at second period in ending string if (last_nondot < domain.length()) domain.erase(last_nondot); } |