| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/renderer/manifest/manifest_parser.h" | 5 #include "content/renderer/manifest/manifest_parser.h" |
| 6 | 6 |
| 7 #include <stdint.h> |
| 8 |
| 9 #include "base/macros.h" |
| 7 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| 8 #include "content/public/common/manifest.h" | 11 #include "content/public/common/manifest.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 13 |
| 11 namespace content { | 14 namespace content { |
| 12 | 15 |
| 13 namespace { | 16 namespace { |
| 14 | 17 |
| 15 uint32_t ExtractColor(int64_t color) { | 18 uint32_t ExtractColor(int64_t color) { |
| 16 return reinterpret_cast<uint32_t&>(color); | 19 return reinterpret_cast<uint32_t&>(color); |
| (...skipping 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1366 Manifest manifest = ParseManifest("{ \"gcm_sender_id\": 42 }"); | 1369 Manifest manifest = ParseManifest("{ \"gcm_sender_id\": 42 }"); |
| 1367 EXPECT_TRUE(manifest.gcm_sender_id.is_null()); | 1370 EXPECT_TRUE(manifest.gcm_sender_id.is_null()); |
| 1368 EXPECT_EQ(1u, GetErrorCount()); | 1371 EXPECT_EQ(1u, GetErrorCount()); |
| 1369 EXPECT_EQ("Manifest parsing error: property 'gcm_sender_id' ignored," | 1372 EXPECT_EQ("Manifest parsing error: property 'gcm_sender_id' ignored," |
| 1370 " type string expected.", | 1373 " type string expected.", |
| 1371 errors()[0]); | 1374 errors()[0]); |
| 1372 } | 1375 } |
| 1373 } | 1376 } |
| 1374 | 1377 |
| 1375 } // namespace content | 1378 } // namespace content |
| OLD | NEW |