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

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

Issue 7038052: Add initial framework for performance tests that measure frame rate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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/frame_rate/frame_rate_tests.cc ('k') | chrome/test/ui/ui_perf_test.h » ('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) 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/test/ui/javascript_test_util.h" 5 #include "chrome/test/ui/javascript_test_util.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 11 #include "base/values.h"
11 #include "content/common/json_value_serializer.h" 12 #include "content/common/json_value_serializer.h"
12 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
13 14
14 bool JsonDictionaryToMap(const std::string& json, 15 bool JsonDictionaryToMap(const std::string& json,
15 std::map<std::string, std::string>* results) { 16 std::map<std::string, std::string>* results) {
16 DCHECK(results != NULL); 17 DCHECK(results != NULL);
17 JSONStringValueSerializer deserializer(json); 18 JSONStringValueSerializer deserializer(json);
18 scoped_ptr<Value> root(deserializer.Deserialize(NULL, NULL)); 19 scoped_ptr<Value> root(deserializer.Deserialize(NULL, NULL));
(...skipping 12 matching lines...) Expand all
31 32
32 for (DictionaryValue::key_iterator it = dict->begin_keys(); 33 for (DictionaryValue::key_iterator it = dict->begin_keys();
33 it != dict->end_keys(); ++it) { 34 it != dict->end_keys(); ++it) {
34 Value* value = NULL; 35 Value* value = NULL;
35 bool succeeded = dict->GetWithoutPathExpansion(*it, &value); 36 bool succeeded = dict->GetWithoutPathExpansion(*it, &value);
36 37
37 EXPECT_TRUE(succeeded); 38 EXPECT_TRUE(succeeded);
38 if (!succeeded) 39 if (!succeeded)
39 continue; 40 continue;
40 41
41 EXPECT_TRUE(value->IsType(Value::TYPE_STRING)); 42 const std::string& key(*it);
42 if (value->IsType(Value::TYPE_STRING)) { 43 std::string result;
43 const std::string& key(*it);
44 44
45 std::string result; 45 switch (value->GetType()) {
46 succeeded = value->GetAsString(&result); 46 case Value::TYPE_STRING:
47 EXPECT_TRUE(succeeded); 47 succeeded = value->GetAsString(&result);
48 break;
49 case Value::TYPE_DOUBLE: {
50 double double_result;
51 succeeded = value->GetAsDouble(&double_result);
52 if (succeeded)
53 result = base::DoubleToString(double_result);
54 break;
55 }
56 default:
57 NOTREACHED() << "Value type not supported!";
58 return false;
59 }
48 60
49 if (succeeded) 61 EXPECT_TRUE(succeeded);
50 results->insert(std::make_pair(key, result)); 62 if (succeeded)
51 } 63 results->insert(std::make_pair(key, result));
52 } 64 }
53 65
54 return true; 66 return true;
55 } 67 }
OLDNEW
« no previous file with comments | « chrome/test/perf/frame_rate/frame_rate_tests.cc ('k') | chrome/test/ui/ui_perf_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698