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

Side by Side Diff: extensions/shell/browser/shell_browsertest.cc

Issue 425303002: Move extension notifications to extensions/browser/notification_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (extension-notifications) rebase Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « extensions/shell/DEPS ('k') | extensions/shell/browser/shell_extension_system.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "chrome/browser/chrome_notification_types.h"
9 #include "content/public/browser/notification_service.h" 8 #include "content/public/browser/notification_service.h"
10 #include "content/public/test/test_utils.h" 9 #include "content/public/test/test_utils.h"
10 #include "extensions/browser/notification_types.h"
11 #include "extensions/common/extension_paths.h" 11 #include "extensions/common/extension_paths.h"
12 #include "extensions/shell/test/shell_test.h" 12 #include "extensions/shell/test/shell_test.h"
13 13
14 namespace extensions { 14 namespace extensions {
15 15
16 // Test that we can open an app window and wait for it to load. 16 // Test that we can open an app window and wait for it to load.
17 IN_PROC_BROWSER_TEST_F(AppShellTest, Basic) { 17 IN_PROC_BROWSER_TEST_F(AppShellTest, Basic) {
18 base::FilePath test_data_dir; 18 base::FilePath test_data_dir;
19 19
20 content::WindowedNotificationObserver test_pass_observer( 20 content::WindowedNotificationObserver test_pass_observer(
21 chrome::NOTIFICATION_EXTENSION_TEST_PASSED, 21 extensions::NOTIFICATION_EXTENSION_TEST_PASSED,
22 content::NotificationService::AllSources()); 22 content::NotificationService::AllSources());
23 23
24 PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir); 24 PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir);
25 test_data_dir = test_data_dir.AppendASCII("platform_app"); 25 test_data_dir = test_data_dir.AppendASCII("platform_app");
26 LoadAndLaunchApp(test_data_dir); 26 LoadAndLaunchApp(test_data_dir);
27 27
28 test_pass_observer.Wait(); 28 test_pass_observer.Wait();
29 } 29 }
30 30
31 } // namespace extensions 31 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/DEPS ('k') | extensions/shell/browser/shell_extension_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698