third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc - Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll).

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: third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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

« no previous file with comments | « third_party/protobuf/src/google/protobuf/descriptor_database.cc ('k') | third_party/protobuf/src/google/protobuf/descriptor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc

diff --git a/third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc b/third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc

index 1c03c4438efdef98c56b972dd6f7633c100727d5..ac72ddcdbe31f6b7ed28d53b0bea614b3135c876 100644

--- a/third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc

+++ b/third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc

@@ -1,6 +1,6 @@

// Protocol Buffers - Google's data interchange format

-// https://developers.google.com/protocol-buffers/

+// http://code.google.com/p/protobuf/

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

@@ -408,7 +408,7 @@ TEST_P(DescriptorDatabaseTest, FindAllExtensionNumbers) {

vector<int> numbers;

EXPECT_TRUE(database_->FindAllExtensionNumbers("Foo", &numbers));

ASSERT_EQ(2, numbers.size());

- std::sort(numbers.begin(), numbers.end());

+ sort(numbers.begin(), numbers.end());

EXPECT_EQ(5, numbers[0]);

EXPECT_EQ(32, numbers[1]);

}

@@ -722,7 +722,7 @@ TEST_F(MergedDescriptorDatabaseTest, FindAllExtensionNumbers) {

vector<int> numbers;

EXPECT_TRUE(forward_merged_.FindAllExtensionNumbers("Baz", &numbers));

ASSERT_EQ(2, numbers.size());

- std::sort(numbers.begin(), numbers.end());

+ sort(numbers.begin(), numbers.end());

EXPECT_EQ(12, numbers[0]);

EXPECT_EQ(13, numbers[1]);

}

@@ -731,7 +731,7 @@ TEST_F(MergedDescriptorDatabaseTest, FindAllExtensionNumbers) {

vector<int> numbers;

EXPECT_TRUE(reverse_merged_.FindAllExtensionNumbers("Baz", &numbers));

ASSERT_EQ(2, numbers.size());

- std::sort(numbers.begin(), numbers.end());

+ sort(numbers.begin(), numbers.end());

EXPECT_EQ(12, numbers[0]);

EXPECT_EQ(13, numbers[1]);

}