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

Side by Side Diff: chrome/browser/devtools/devtools_sanity_browsertest.cc

Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 5 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
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/cancelable_callback.h" 6 #include "base/cancelable_callback.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/prefs/pref_service.h" 13 #include "base/prefs/pref_service.h"
14 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/test/test_timeouts.h" 18 #include "base/test/test_timeouts.h"
19 #include "base/thread_task_runner_handle.h" 19 #include "base/thread_task_runner_handle.h"
20 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
21 #include "chrome/browser/devtools/device/tcp_device_provider.h" 21 #include "chrome/browser/devtools/device/tcp_device_provider.h"
22 #include "chrome/browser/devtools/devtools_window_testing.h" 22 #include "chrome/browser/devtools/devtools_window_testing.h"
23 #include "chrome/browser/extensions/extension_apitest.h" 23 #include "chrome/browser/extensions/extension_apitest.h"
24 #include "chrome/browser/extensions/extension_browsertest.h" 24 #include "chrome/browser/extensions/extension_browsertest.h"
25 #include "chrome/browser/extensions/extension_service.h" 25 #include "chrome/browser/extensions/extension_service.h"
26 #include "chrome/browser/extensions/unpacked_installer.h" 26 #include "chrome/browser/extensions/unpacked_installer.h"
27 #include "chrome/browser/lifetime/application_lifetime.h" 27 #include "chrome/browser/lifetime/application_lifetime.h"
28 #include "chrome/browser/lifetime/browser_keep_alive.h"
28 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/ui/browser.h" 30 #include "chrome/browser/ui/browser.h"
30 #include "chrome/browser/ui/browser_commands.h" 31 #include "chrome/browser/ui/browser_commands.h"
31 #include "chrome/browser/ui/browser_iterator.h" 32 #include "chrome/browser/ui/browser_iterator.h"
32 #include "chrome/browser/ui/tabs/tab_strip_model.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model.h"
33 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
34 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
36 #include "chrome/common/url_constants.h" 37 #include "chrome/common/url_constants.h"
37 #include "chrome/test/base/in_process_browser_test.h" 38 #include "chrome/test/base/in_process_browser_test.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 return DevToolsWindowTesting::Get(window_)->toolbox_web_contents(); 174 return DevToolsWindowTesting::Get(window_)->toolbox_web_contents();
174 } 175 }
175 176
176 DevToolsWindow* window_; 177 DevToolsWindow* window_;
177 }; 178 };
178 179
179 // Used to block until a dev tools window gets beforeunload event. 180 // Used to block until a dev tools window gets beforeunload event.
180 class DevToolsWindowBeforeUnloadObserver 181 class DevToolsWindowBeforeUnloadObserver
181 : public content::WebContentsObserver { 182 : public content::WebContentsObserver {
182 public: 183 public:
183 explicit DevToolsWindowBeforeUnloadObserver(DevToolsWindow*); 184 explicit DevToolsWindowBeforeUnloadObserver(DevToolsWindow* devtools_window);
184 void Wait(); 185 void Wait();
186
185 private: 187 private:
186 // Invoked when the beforeunload handler fires. 188 // Invoked when the beforeunload handler fires.
187 void BeforeUnloadFired(const base::TimeTicks& proceed_time) override; 189 void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
188 190
189 bool m_fired; 191 bool m_fired;
190 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; 192 scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
191 DISALLOW_COPY_AND_ASSIGN(DevToolsWindowBeforeUnloadObserver); 193 DISALLOW_COPY_AND_ASSIGN(DevToolsWindowBeforeUnloadObserver);
192 }; 194 };
193 195
194 DevToolsWindowBeforeUnloadObserver::DevToolsWindowBeforeUnloadObserver( 196 DevToolsWindowBeforeUnloadObserver::DevToolsWindowBeforeUnloadObserver(
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 chrome::CloseWindow(browser()); 704 chrome::CloseWindow(browser());
703 AcceptModalDialog(); 705 AcceptModalDialog();
704 CancelModalDialog(); 706 CancelModalDialog();
705 cancel_browser.Wait(); 707 cancel_browser.Wait();
706 } 708 }
707 // Try to exit application. 709 // Try to exit application.
708 { 710 {
709 content::WindowedNotificationObserver close_observer( 711 content::WindowedNotificationObserver close_observer(
710 chrome::NOTIFICATION_BROWSER_CLOSED, 712 chrome::NOTIFICATION_BROWSER_CLOSED,
711 content::Source<Browser>(browser())); 713 content::Source<Browser>(browser()));
712 chrome::IncrementKeepAliveCount(); 714 browser_lifetime::IncrementKeepAliveCount();
sky 2015/10/07 17:27:24 Could you use a scopedkeepalive here that is reset
713 chrome::CloseAllBrowsers(); 715 chrome::CloseAllBrowsers();
714 AcceptModalDialog(); 716 AcceptModalDialog();
715 AcceptModalDialog(); 717 AcceptModalDialog();
716 close_observer.Wait(); 718 close_observer.Wait();
717 } 719 }
718 for (size_t i = 0; i < close_observers.size(); ++i) { 720 for (size_t i = 0; i < close_observers.size(); ++i) {
719 close_observers[i]->Wait(); 721 close_observers[i]->Wait();
720 delete close_observers[i]; 722 delete close_observers[i];
721 } 723 }
722 } 724 }
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 (defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)) 1039 (defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD))
1038 #define MAYBE_TestScreenshotRecording DISABLED_TestScreenshotRecording 1040 #define MAYBE_TestScreenshotRecording DISABLED_TestScreenshotRecording
1039 #else 1041 #else
1040 #define MAYBE_TestScreenshotRecording TestScreenshotRecording 1042 #define MAYBE_TestScreenshotRecording TestScreenshotRecording
1041 #endif 1043 #endif
1042 // Tests raw headers text. 1044 // Tests raw headers text.
1043 IN_PROC_BROWSER_TEST_F(DevToolsPixelOutputTests, 1045 IN_PROC_BROWSER_TEST_F(DevToolsPixelOutputTests,
1044 MAYBE_TestScreenshotRecording) { 1046 MAYBE_TestScreenshotRecording) {
1045 RunTest("testScreenshotRecording", std::string()); 1047 RunTest("testScreenshotRecording", std::string());
1046 } 1048 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698