OLD | NEW |
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/browser/component_updater/flash_component_installer.h" | 5 #include "chrome/browser/component_updater/flash_component_installer.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/json/json_value_serializer.h" | 9 #include "base/json/json_value_serializer.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/message_loop.h" |
11 #include "base/path_service.h" | 12 #include "base/path_service.h" |
12 #include "base/version.h" | 13 #include "base/version.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
15 #include "content/test/test_browser_thread.h" | 16 #include "content/test/test_browser_thread.h" |
16 | 17 |
17 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
18 | 19 |
19 using content::BrowserThread; | 20 using content::BrowserThread; |
20 | 21 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 // This just tests the API (i.e., Pepper interfaces). | 62 // This just tests the API (i.e., Pepper interfaces). |
62 EXPECT_TRUE(VetoPepperFlashIntefaces( | 63 EXPECT_TRUE(VetoPepperFlashIntefaces( |
63 static_cast<base::DictionaryValue*>(root.get()))); | 64 static_cast<base::DictionaryValue*>(root.get()))); |
64 | 65 |
65 // This checks that the whole manifest is compatible. | 66 // This checks that the whole manifest is compatible. |
66 Version version; | 67 Version version; |
67 EXPECT_TRUE(CheckPepperFlashManifest( | 68 EXPECT_TRUE(CheckPepperFlashManifest( |
68 static_cast<base::DictionaryValue*>(root.get()), &version)); | 69 static_cast<base::DictionaryValue*>(root.get()), &version)); |
69 EXPECT_TRUE(version.IsValid()); | 70 EXPECT_TRUE(version.IsValid()); |
70 } | 71 } |
OLD | NEW |