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

Side by Side Diff: extensions/browser/api/runtime/runtime_apitest.cc

Issue 1970613003: Add a new app API to enable watchdog behavior restarts in kiosk apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + Convert browser tests to unit tests. Created 4 years, 6 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
OLDNEW
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 "base/callback_helpers.h"
Devlin 2016/06/01 21:29:15 Do we need these still?
afakhry 2016/06/02 01:43:40 No. Removed.
5 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_function_test_utils.h" 8 #include "chrome/browser/extensions/extension_function_test_utils.h"
8 #include "chrome/browser/extensions/test_extension_dir.h" 9 #include "chrome/browser/extensions/test_extension_dir.h"
9 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
10 #include "content/public/browser/notification_service.h" 11 #include "content/public/browser/notification_service.h"
11 #include "extensions/browser/api/runtime/runtime_api.h" 12 #include "extensions/browser/api/runtime/runtime_api.h"
12 #include "extensions/browser/extension_dialog_auto_confirm.h" 13 #include "extensions/browser/extension_dialog_auto_confirm.h"
13 #include "extensions/browser/extension_registry.h" 14 #include "extensions/browser/extension_registry.h"
15 #include "extensions/test/extension_test_message_listener.h"
afakhry 2016/06/02 01:43:40 Removed too.
14 #include "extensions/test/result_catcher.h" 16 #include "extensions/test/result_catcher.h"
15 #include "net/test/embedded_test_server/embedded_test_server.h" 17 #include "net/test/embedded_test_server/embedded_test_server.h"
16 18
17 // Tests the privileged components of chrome.runtime. 19 // Tests the privileged components of chrome.runtime.
18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) { 20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) {
19 ASSERT_TRUE(RunExtensionTest("runtime/privileged")) << message_; 21 ASSERT_TRUE(RunExtensionTest("runtime/privileged")) << message_;
20 } 22 }
21 23
22 // Tests the unprivileged components of chrome.runtime. 24 // Tests the unprivileged components of chrome.runtime.
23 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUnprivileged) { 25 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUnprivileged) {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } else { 124 } else {
123 load_observer.Wait(); 125 load_observer.Wait();
124 WaitForExtensionViewsToLoad(); 126 WaitForExtensionViewsToLoad();
125 } 127 }
126 } 128 }
127 ASSERT_TRUE( 129 ASSERT_TRUE(
128 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); 130 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED));
129 } 131 }
130 132
131 } // namespace extensions 133 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698