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 "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
6 #include "chrome/browser/extensions/extension_service.h" | 6 #include "chrome/browser/extensions/extension_service.h" |
7 #include "chrome/browser/extensions/extension_system.h" | |
8 #include "chrome/browser/extensions/extension_test_message_listener.h" | 7 #include "chrome/browser/extensions/extension_test_message_listener.h" |
9 #include "chrome/common/extensions/api/alarms.h" | 8 #include "chrome/common/extensions/api/alarms.h" |
10 #include "content/public/test/browser_test.h" | 9 #include "content/public/test/browser_test.h" |
11 #include "content/public/test/test_utils.h" | 10 #include "content/public/test/test_utils.h" |
12 #include "extensions/browser/event_router.h" | 11 #include "extensions/browser/event_router.h" |
| 12 #include "extensions/browser/extension_system.h" |
13 #include "extensions/browser/process_manager.h" | 13 #include "extensions/browser/process_manager.h" |
14 #include "extensions/common/switches.h" | 14 #include "extensions/common/switches.h" |
15 | 15 |
16 using extensions::Event; | 16 using extensions::Event; |
17 using extensions::EventRouter; | 17 using extensions::EventRouter; |
18 using extensions::Extension; | 18 using extensions::Extension; |
19 using extensions::ExtensionSystem; | 19 using extensions::ExtensionSystem; |
20 using extensions::PlatformAppBrowserTest; | 20 using extensions::PlatformAppBrowserTest; |
21 | 21 |
22 namespace { | 22 namespace { |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 ExtensionSystem::Get(browser()->profile())->extension_service(); | 193 ExtensionSystem::Get(browser()->profile())->extension_service(); |
194 EXPECT_TRUE(service->UpdateExtension(app_id, app_v2_path, true, GURL(), | 194 EXPECT_TRUE(service->UpdateExtension(app_id, app_v2_path, true, GURL(), |
195 &crx_installer)); | 195 &crx_installer)); |
196 windowed_observer.Wait(); | 196 windowed_observer.Wait(); |
197 | 197 |
198 const Extension* app_v2 = service->GetExtensionById(app_id, false); | 198 const Extension* app_v2 = service->GetExtensionById(app_id, false); |
199 ASSERT_TRUE(app_v2); | 199 ASSERT_TRUE(app_v2); |
200 EXPECT_TRUE(app_v2->version()->CompareTo(app_original_version) > 0); | 200 EXPECT_TRUE(app_v2->version()->CompareTo(app_original_version) > 0); |
201 EXPECT_TRUE(app_v2->is_ephemeral()); | 201 EXPECT_TRUE(app_v2->is_ephemeral()); |
202 } | 202 } |
OLD | NEW |