Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3393)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/omnibox/omnibox_unittest.cc

Issue 1739183003: Make extensions::DictionaryBuilder and extensions::ListValue unmovable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc ('K') | « chrome/browser/extensions/api/identity/identity_apitest.cc ('k') | chrome/browser/extensions/api/storage/settings_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc b/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
index c6e9f9a6da6daed87ed60f734ff8ef9ca07f988d..20a05b56d701affad6f56312cf341286d3012532 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
@@ -48,21 +48,25 @@ TEST(ExtensionOmniboxTest, DescriptionStylesSimple) {
scoped_ptr<base::ListValue> list =
ListBuilder()
.Append(42)
- .Append(std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("content", "content")
- .Set("description", "description")
- .Set("descriptionStyles",
- std::move(
- ListBuilder()
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 1)
- .Set("length", 4)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 6)
- .Set("length", 3)))))))))
+ .Append(ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("content", "content")
+ .Set("description", "description")
+ .Set("descriptionStyles",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 1)
+ .Set("length", 4)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 6)
+ .Set("length", 3)
+ .Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
ACMatchClassifications styles_expected;
@@ -83,21 +87,25 @@ TEST(ExtensionOmniboxTest, DescriptionStylesSimple) {
scoped_ptr<base::ListValue> swap_list =
ListBuilder()
.Append(42)
- .Append(std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("content", "content")
- .Set("description", "description")
- .Set("descriptionStyles",
- std::move(
- ListBuilder()
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 6)
- .Set("length", 3)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 1)
- .Set("length", 4)))))))))
+ .Append(ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("content", "content")
+ .Set("description", "description")
+ .Set("descriptionStyles",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 6)
+ .Set("length", 3)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 1)
+ .Set("length", 4)
+ .Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
scoped_ptr<SendSuggestions::Params> swapped_params(
@@ -119,33 +127,40 @@ TEST(ExtensionOmniboxTest, DescriptionStylesCombine) {
scoped_ptr<base::ListValue> list =
ListBuilder()
.Append(42)
- .Append(std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("content", "content")
- .Set("description", "description")
- .Set("descriptionStyles",
- std::move(
- ListBuilder()
- .Append(std::move(DictionaryBuilder()
- .Set("type", "url")
- .Set("offset", 0)
- .Set("length", 5)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 9)
- .Set("length", 2)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 9)
- .Set("length", 2)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 0)
- .Set("length", 4)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 1)
- .Set("length", 2)))))))))
+ .Append(ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("content", "content")
+ .Set("description", "description")
+ .Set("descriptionStyles",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("type", "url")
+ .Set("offset", 0)
+ .Set("length", 5)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 9)
+ .Set("length", 2)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 9)
+ .Set("length", 2)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 0)
+ .Set("length", 4)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 1)
+ .Set("length", 2)
+ .Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
ACMatchClassifications styles_expected;
@@ -168,33 +183,40 @@ TEST(ExtensionOmniboxTest, DescriptionStylesCombine) {
scoped_ptr<base::ListValue> moved_list =
ListBuilder()
.Append(42)
- .Append(std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("content", "content")
- .Set("description", "description")
- .Set("descriptionStyles",
- std::move(
- ListBuilder()
- .Append(std::move(DictionaryBuilder()
- .Set("type", "url")
- .Set("offset", 0)
- .Set("length", 5)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 0)
- .Set("length", 4)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 9)
- .Set("length", 2)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 9)
- .Set("length", 2)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 1)
- .Set("length", 2)))))))))
+ .Append(ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("content", "content")
+ .Set("description", "description")
+ .Set("descriptionStyles",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("type", "url")
+ .Set("offset", 0)
+ .Set("length", 5)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 0)
+ .Set("length", 4)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 9)
+ .Set("length", 2)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 9)
+ .Set("length", 2)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 1)
+ .Set("length", 2)
+ .Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
scoped_ptr<SendSuggestions::Params> moved_params(
@@ -216,33 +238,40 @@ TEST(ExtensionOmniboxTest, DescriptionStylesCombine2) {
scoped_ptr<base::ListValue> list =
ListBuilder()
.Append(42)
- .Append(std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("content", "content")
- .Set("description", "description")
- .Set("descriptionStyles",
- std::move(
- ListBuilder()
- .Append(std::move(DictionaryBuilder()
- .Set("type", "url")
- .Set("offset", 0)
- .Set("length", 5)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 0)
- .Set("length", 5)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 0)
- .Set("length", 3)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 2)
- .Set("length", 3)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 0)
- .Set("length", 3)))))))))
+ .Append(ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("content", "content")
+ .Set("description", "description")
+ .Set("descriptionStyles",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("type", "url")
+ .Set("offset", 0)
+ .Set("length", 5)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 0)
+ .Set("length", 5)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 0)
+ .Set("length", 3)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 2)
+ .Set("length", 3)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 0)
+ .Set("length", 3)
+ .Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
ACMatchClassifications styles_expected;
@@ -268,34 +297,37 @@ TEST(ExtensionOmniboxTest, DefaultSuggestResult) {
// Default suggestions should not have a content parameter.
scoped_ptr<base::ListValue> list =
ListBuilder()
- .Append(std::move(
- DictionaryBuilder()
- .Set("description", "description")
- .Set(
- "descriptionStyles",
- std::move(
- ListBuilder()
- .Append(std::move(
- DictionaryBuilder()
- .Set("type", "url")
- .Set("offset", 0)
- .Set("length", 5)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 0)
- .Set("length", 5)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "match")
- .Set("offset", 0)
- .Set("length", 3)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 2)
- .Set("length", 3)))
- .Append(std::move(DictionaryBuilder()
- .Set("type", "dim")
- .Set("offset", 0)
- .Set("length", 3)))))))
+ .Append(DictionaryBuilder()
+ .Set("description", "description")
+ .Set("descriptionStyles",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("type", "url")
+ .Set("offset", 0)
+ .Set("length", 5)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 0)
+ .Set("length", 5)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "match")
+ .Set("offset", 0)
+ .Set("length", 3)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 2)
+ .Set("length", 3)
+ .Build())
+ .Append(DictionaryBuilder()
+ .Set("type", "dim")
+ .Set("offset", 0)
+ .Set("length", 3)
+ .Build())
+ .Build())
+ .Build())
.Build();
scoped_ptr<SetDefaultSuggestion::Params> params(
« chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc ('K') | « chrome/browser/extensions/api/identity/identity_apitest.cc ('k') | chrome/browser/extensions/api/storage/settings_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698