| OLD | NEW |
| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/json/json_value_serializer.h" | 8 #include "base/json/json_string_value_serializer.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/perftimer.h" | 10 #include "base/perftimer.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
| 14 #include "chrome/common/logging_chrome.h" | 14 #include "chrome/common/logging_chrome.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 class JSONValueSerializerTests : public testing::Test { | 18 class JSONValueSerializerTests : public testing::Test { |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 } | 81 } |
| 82 } | 82 } |
| 83 chrome_timer.Done(); | 83 chrome_timer.Done(); |
| 84 | 84 |
| 85 // Clean up test cases. | 85 // Clean up test cases. |
| 86 for (size_t i = 0; i < test_cases.size(); ++i) { | 86 for (size_t i = 0; i < test_cases.size(); ++i) { |
| 87 delete test_cases[i]; | 87 delete test_cases[i]; |
| 88 test_cases[i] = NULL; | 88 test_cases[i] = NULL; |
| 89 } | 89 } |
| 90 } | 90 } |
| OLD | NEW |