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

Side by Side Diff: chrome/browser/extensions/platform_app_browsertest_util.cc

Issue 11147017: Remove unneeded flag for platform app tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 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 | « no previous file | chrome/test/data/extensions/api_test/file_system/get_display_path_prettify_mac/manifest.json » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extensions/platform_app_browsertest_util.h" 5 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "chrome/browser/extensions/api/tabs/tabs.h" 9 #include "chrome/browser/extensions/api/tabs/tabs.h"
10 #include "chrome/browser/extensions/extension_function_test_utils.h" 10 #include "chrome/browser/extensions/extension_function_test_utils.h"
11 #include "chrome/browser/extensions/shell_window_registry.h" 11 #include "chrome/browser/extensions/shell_window_registry.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/extensions/application_launch.h" 13 #include "chrome/browser/ui/extensions/application_launch.h"
14 #include "chrome/browser/ui/extensions/shell_window.h" 14 #include "chrome/browser/ui/extensions/shell_window.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
17 #include "content/public/test/test_utils.h" 17 #include "content/public/test/test_utils.h"
18 18
19 using content::WebContents; 19 using content::WebContents;
20 20
21 namespace utils = extension_function_test_utils; 21 namespace utils = extension_function_test_utils;
22 22
23 namespace extensions { 23 namespace extensions {
24 24
25 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) { 25 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
26 // Skips ExtensionApiTest::SetUpCommandLine.
26 ExtensionBrowserTest::SetUpCommandLine(command_line); 27 ExtensionBrowserTest::SetUpCommandLine(command_line);
27 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
28 28
29 // Make event pages get suspended quicker. 29 // Make event pages get suspended quicker.
30 command_line->AppendSwitchASCII(switches::kEventPageIdleTime, "1"); 30 command_line->AppendSwitchASCII(switches::kEventPageIdleTime, "1");
31 command_line->AppendSwitchASCII(switches::kEventPageUnloadingTime, "1"); 31 command_line->AppendSwitchASCII(switches::kEventPageUnloadingTime, "1");
32 } 32 }
33 33
34 const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp( 34 const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp(
35 const char* name) { 35 const char* name) {
36 content::WindowedNotificationObserver app_loaded_observer( 36 content::WindowedNotificationObserver app_loaded_observer(
37 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, 37 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { 146 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) {
147 content::WindowedNotificationObserver destroyed_observer( 147 content::WindowedNotificationObserver destroyed_observer(
148 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, 148 content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
149 content::NotificationService::AllSources()); 149 content::NotificationService::AllSources());
150 window->GetBaseWindow()->Close(); 150 window->GetBaseWindow()->Close();
151 destroyed_observer.Wait(); 151 destroyed_observer.Wait();
152 } 152 }
153 153
154 } // namespace extensions 154 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/file_system/get_display_path_prettify_mac/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698