summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrunal.kapade@intel.com <mrunal.kapade@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 21:23:28 +0000
committermrunal.kapade@intel.com <mrunal.kapade@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 21:23:28 +0000
commitdc7d3051d2099e8c9cc18d41c341b53f353acb28 (patch)
treeee83d619c5f3c863f7436f820ab95c08b9a4ba6f
parent191264b3988cec9f097641c339692416c3949a72 (diff)
downloadchromium_src-dc7d3051d2099e8c9cc18d41c341b53f353acb28.zip
chromium_src-dc7d3051d2099e8c9cc18d41c341b53f353acb28.tar.gz
chromium_src-dc7d3051d2099e8c9cc18d41c341b53f353acb28.tar.bz2
Style fix - segment_case -> SegmentCase and fixup_case -> FixupCase
BUG= Uploading this patch after wtc's suggestion on, http://crrev.com/14942008 Review URL: https://chromiumcodereview.appspot.com/16249002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203480 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/net/url_fixer_upper_unittest.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc
index 7b4a97d..491d478 100644
--- a/chrome/browser/net/url_fixer_upper_unittest.cc
+++ b/chrome/browser/net/url_fixer_upper_unittest.cc
@@ -29,7 +29,7 @@ std::ostream& operator<<(std::ostream& os, const Component& part) {
} // namespace url_parse
-struct segment_case {
+struct SegmentCase {
const std::string input;
const std::string result;
const url_parse::Component scheme;
@@ -42,7 +42,7 @@ struct segment_case {
const url_parse::Component ref;
};
-static const segment_case segment_cases[] = {
+static const SegmentCase segment_cases[] = {
{ "http://www.google.com/", "http",
url_parse::Component(0, 4), // scheme
url_parse::Component(), // username
@@ -202,7 +202,7 @@ TEST(URLFixerUpperTest, SegmentURL) {
url_parse::Parsed parts;
for (size_t i = 0; i < arraysize(segment_cases); ++i) {
- segment_case value = segment_cases[i];
+ SegmentCase value = segment_cases[i];
result = URLFixerUpper::SegmentURL(value.input, &parts);
EXPECT_EQ(value.result, result);
EXPECT_EQ(value.scheme, parts.scheme);
@@ -245,7 +245,7 @@ static bool IsMatchingFileURL(const std::string& url,
full_file_path.value());
}
-struct fixup_case {
+struct FixupCase {
const std::string input;
const std::string desired_tld;
const std::string output;
@@ -327,14 +327,14 @@ struct fixup_case {
TEST(URLFixerUpperTest, FixupURL) {
for (size_t i = 0; i < arraysize(fixup_cases); ++i) {
- fixup_case value = fixup_cases[i];
+ FixupCase value = fixup_cases[i];
EXPECT_EQ(value.output, URLFixerUpper::FixupURL(value.input,
value.desired_tld).possibly_invalid_spec())
<< "input: " << value.input;
}
// Check the TLD-appending functionality
- fixup_case tld_cases[] = {
+ FixupCase tld_cases[] = {
{"google", "com", "http://www.google.com/"},
{"google.", "com", "http://www.google.com/"},
{"google..", "com", "http://www.google.com/"},
@@ -355,7 +355,7 @@ TEST(URLFixerUpperTest, FixupURL) {
{"http://google:123", "com", "http://www.google.com:123/"},
};
for (size_t i = 0; i < arraysize(tld_cases); ++i) {
- fixup_case value = tld_cases[i];
+ FixupCase value = tld_cases[i];
EXPECT_EQ(value.output, URLFixerUpper::FixupURL(value.input,
value.desired_tld).possibly_invalid_spec());
}
@@ -394,7 +394,7 @@ TEST(URLFixerUpperTest, FixupFile) {
cur[1] = '|';
EXPECT_EQ(golden, URLFixerUpper::FixupURL(cur, std::string()));
- fixup_case file_cases[] = {
+ FixupCase file_cases[] = {
{"c:\\This%20is a non-existent file.txt", "",
"file:///C:/This%2520is%20a%20non-existent%20file.txt"},
@@ -433,7 +433,7 @@ TEST(URLFixerUpperTest, FixupFile) {
#define HOME "/home/"
#endif
URLFixerUpper::home_directory_override = "/foo";
- fixup_case file_cases[] = {
+ FixupCase file_cases[] = {
// File URLs go through GURL, which tries to escape intelligently.
{"/This%20is a non-existent file.txt", "",
"file:///This%2520is%20a%20non-existent%20file.txt"},
@@ -473,7 +473,7 @@ TEST(URLFixerUpperTest, FixupRelativeFile) {
// make sure we pass through good URLs
for (size_t i = 0; i < arraysize(fixup_cases); ++i) {
- fixup_case value = fixup_cases[i];
+ FixupCase value = fixup_cases[i];
base::FilePath input = base::FilePath::FromUTF8Unsafe(value.input);
EXPECT_EQ(value.output,
URLFixerUpper::FixupRelativeFile(dir, input).possibly_invalid_spec());