| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/sync/sessions/session_state.h" | 5 #include "chrome/browser/sync/sessions/session_state.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "chrome/test/values_test_util.h" | 12 #include "chrome/test/base/values_test_util.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 14 |
| 15 namespace browser_sync { | 15 namespace browser_sync { |
| 16 namespace sessions { | 16 namespace sessions { |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 using test::ExpectDictBooleanValue; | 19 using test::ExpectDictBooleanValue; |
| 20 using test::ExpectDictDictionaryValue; | 20 using test::ExpectDictDictionaryValue; |
| 21 using test::ExpectDictIntegerValue; | 21 using test::ExpectDictIntegerValue; |
| 22 using test::ExpectDictListValue; | 22 using test::ExpectDictListValue; |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 ExpectDictIntegerValue(kNumConflictingUpdates, *value, | 181 ExpectDictIntegerValue(kNumConflictingUpdates, *value, |
| 182 "numConflictingUpdates"); | 182 "numConflictingUpdates"); |
| 183 ExpectDictBooleanValue(kDidCommitItems, *value, | 183 ExpectDictBooleanValue(kDidCommitItems, *value, |
| 184 "didCommitItems"); | 184 "didCommitItems"); |
| 185 ExpectDictDictionaryValue(*expected_source_value, *value, "source"); | 185 ExpectDictDictionaryValue(*expected_source_value, *value, "source"); |
| 186 } | 186 } |
| 187 | 187 |
| 188 } // namespace | 188 } // namespace |
| 189 } // namespace sessions | 189 } // namespace sessions |
| 190 } // namespace browser_sync | 190 } // namespace browser_sync |
| OLD | NEW |