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

Side by Side Diff: chrome/test/ui/javascript_test_util.cc

Issue 9465030: Break two classes defined in json_value_serializer.cc, .h into separate files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/perf/v8_benchmark_uitest.cc ('k') | chrome/test/ui/ui_test.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/test/ui/javascript_test_util.h" 5 #include "chrome/test/ui/javascript_test_util.h"
6 6
7 #include "base/json/json_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 bool JsonDictionaryToMap(const std::string& json, 15 bool JsonDictionaryToMap(const std::string& json,
16 std::map<std::string, std::string>* results) { 16 std::map<std::string, std::string>* results) {
17 DCHECK(results != NULL); 17 DCHECK(results != NULL);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return false; 58 return false;
59 } 59 }
60 60
61 EXPECT_TRUE(succeeded); 61 EXPECT_TRUE(succeeded);
62 if (succeeded) 62 if (succeeded)
63 results->insert(std::make_pair(key, result)); 63 results->insert(std::make_pair(key, result));
64 } 64 }
65 65
66 return true; 66 return true;
67 } 67 }
OLDNEW
« no previous file with comments | « chrome/test/perf/v8_benchmark_uitest.cc ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698