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

Side by Side Diff: chrome/browser/sync/internal_api/change_record_unittest.cc

Issue 9483002: Move values_test_util.{h,cc} to base/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 9 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 | « base/test/values_test_util.cc ('k') | chrome/browser/sync/internal_api/syncapi_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) 2011 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 "chrome/browser/sync/internal_api/change_record.h" 5 #include "chrome/browser/sync/internal_api/change_record.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/test/values_test_util.h"
9 #include "base/values.h" 10 #include "base/values.h"
10 #include "chrome/browser/sync/protocol/extension_specifics.pb.h" 11 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
11 #include "chrome/browser/sync/protocol/proto_value_conversions.h" 12 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
12 #include "chrome/browser/sync/protocol/sync.pb.h" 13 #include "chrome/browser/sync/protocol/sync.pb.h"
13 #include "chrome/test/base/values_test_util.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace sync_api { 17 namespace sync_api {
18 namespace { 18 namespace {
19 19
20 using test::ExpectDictDictionaryValue; 20 using base::ExpectDictDictionaryValue;
21 using test::ExpectDictStringValue; 21 using base::ExpectDictStringValue;
22 using testing::Invoke; 22 using testing::Invoke;
23 using testing::StrictMock; 23 using testing::StrictMock;
24 24
25 class ChangeRecordTest : public testing::Test {}; 25 class ChangeRecordTest : public testing::Test {};
26 26
27 void ExpectChangeRecordActionValue(ChangeRecord::Action expected_value, 27 void ExpectChangeRecordActionValue(ChangeRecord::Action expected_value,
28 const base::DictionaryValue& value, 28 const base::DictionaryValue& value,
29 const std::string& key) { 29 const std::string& key) {
30 std::string str_value; 30 std::string str_value;
31 EXPECT_TRUE(value.GetString(key, &str_value)); 31 EXPECT_TRUE(value.GetString(key, &str_value));
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 Invoke(&extra_value, &DictionaryValue::DeepCopy)); 128 Invoke(&extra_value, &DictionaryValue::DeepCopy));
129 129
130 record.extra.reset(extra.release()); 130 record.extra.reset(extra.release());
131 scoped_ptr<DictionaryValue> value(record.ToValue()); 131 scoped_ptr<DictionaryValue> value(record.ToValue());
132 CheckChangeRecordValue(record, *value); 132 CheckChangeRecordValue(record, *value);
133 } 133 }
134 } 134 }
135 135
136 } // namespace 136 } // namespace
137 } // namespace sync_api 137 } // namespace sync_api
OLDNEW
« no previous file with comments | « base/test/values_test_util.cc ('k') | chrome/browser/sync/internal_api/syncapi_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698