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

Side by Side Diff: sync/internal_api/public/base/model_type_invalidation_map_unittest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/engine/syncer_util.cc ('k') | sync/internal_api/public/base/ordinal_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/internal_api/public/base/model_type_invalidation_map.h" 5 #include "sync/internal_api/public/base/model_type_invalidation_map.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/test/values_test_util.h" 10 #include "base/test/values_test_util.h"
(...skipping 17 matching lines...) Expand all
28 } 28 }
29 29
30 TEST_F(ModelTypeInvalidationMapTest, TypeInvalidationMapToValue) { 30 TEST_F(ModelTypeInvalidationMapTest, TypeInvalidationMapToValue) {
31 ModelTypeInvalidationMap states; 31 ModelTypeInvalidationMap states;
32 states[BOOKMARKS].payload = "bookmarkpayload"; 32 states[BOOKMARKS].payload = "bookmarkpayload";
33 states[APPS].payload = ""; 33 states[APPS].payload = "";
34 34
35 scoped_ptr<DictionaryValue> value(ModelTypeInvalidationMapToValue(states)); 35 scoped_ptr<DictionaryValue> value(ModelTypeInvalidationMapToValue(states));
36 EXPECT_EQ(2u, value->size()); 36 EXPECT_EQ(2u, value->size());
37 ExpectDictStringValue(states[BOOKMARKS].payload, *value, "Bookmarks"); 37 ExpectDictStringValue(states[BOOKMARKS].payload, *value, "Bookmarks");
38 ExpectDictStringValue("", *value, "Apps"); 38 ExpectDictStringValue(std::string(), *value, "Apps");
39 EXPECT_FALSE(value->HasKey("Preferences")); 39 EXPECT_FALSE(value->HasKey("Preferences"));
40 } 40 }
41 41
42 TEST_F(ModelTypeInvalidationMapTest, CoalesceStates) { 42 TEST_F(ModelTypeInvalidationMapTest, CoalesceStates) {
43 ModelTypeInvalidationMap original; 43 ModelTypeInvalidationMap original;
44 std::string empty_payload; 44 std::string empty_payload;
45 std::string payload1 = "payload1"; 45 std::string payload1 = "payload1";
46 std::string payload2 = "payload2"; 46 std::string payload2 = "payload2";
47 std::string payload3 = "payload3"; 47 std::string payload3 = "payload3";
48 original[BOOKMARKS].payload = empty_payload; 48 original[BOOKMARKS].payload = empty_payload;
(...skipping 12 matching lines...) Expand all
61 ASSERT_EQ(5U, original.size()); 61 ASSERT_EQ(5U, original.size());
62 EXPECT_EQ(empty_payload, original[BOOKMARKS].payload); 62 EXPECT_EQ(empty_payload, original[BOOKMARKS].payload);
63 EXPECT_EQ(payload1, original[PASSWORDS].payload); 63 EXPECT_EQ(payload1, original[PASSWORDS].payload);
64 EXPECT_EQ(payload1, original[AUTOFILL].payload); 64 EXPECT_EQ(payload1, original[AUTOFILL].payload);
65 EXPECT_EQ(payload2, original[SESSIONS].payload); 65 EXPECT_EQ(payload2, original[SESSIONS].payload);
66 EXPECT_EQ(payload3, original[THEMES].payload); 66 EXPECT_EQ(payload3, original[THEMES].payload);
67 } 67 }
68 68
69 } // namespace 69 } // namespace
70 } // namespace syncer 70 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/engine/syncer_util.cc ('k') | sync/internal_api/public/base/ordinal_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698