| OLD | NEW |
| 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/test/base/in_process_browser_test.h" | 5 #include "chrome/test/base/in_process_browser_test.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "components/google/core/browser/google_util.h" | 49 #include "components/google/core/browser/google_util.h" |
| 50 #include "components/os_crypt/os_crypt.h" | 50 #include "components/os_crypt/os_crypt.h" |
| 51 #include "content/public/browser/devtools_agent_host.h" | 51 #include "content/public/browser/devtools_agent_host.h" |
| 52 #include "content/public/browser/notification_service.h" | 52 #include "content/public/browser/notification_service.h" |
| 53 #include "content/public/browser/notification_types.h" | 53 #include "content/public/browser/notification_types.h" |
| 54 #include "content/public/test/browser_test_utils.h" | 54 #include "content/public/test/browser_test_utils.h" |
| 55 #include "content/public/test/test_launcher.h" | 55 #include "content/public/test/test_launcher.h" |
| 56 #include "content/public/test/test_navigation_observer.h" | 56 #include "content/public/test/test_navigation_observer.h" |
| 57 #include "net/test/embedded_test_server/embedded_test_server.h" | 57 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 58 #include "net/test/spawned_test_server/spawned_test_server.h" | 58 #include "net/test/spawned_test_server/spawned_test_server.h" |
| 59 #include "ui/gfx/host_desktop_type.h" |
| 59 | 60 |
| 60 #if defined(OS_MACOSX) | 61 #if defined(OS_MACOSX) |
| 61 #include "base/mac/scoped_nsautorelease_pool.h" | 62 #include "base/mac/scoped_nsautorelease_pool.h" |
| 62 #include "chrome/test/base/scoped_bundle_swizzler_mac.h" | 63 #include "chrome/test/base/scoped_bundle_swizzler_mac.h" |
| 63 #endif | 64 #endif |
| 64 | 65 |
| 65 #if defined(OS_WIN) | 66 #if defined(OS_WIN) |
| 66 #include "base/win/scoped_com_initializer.h" | 67 #include "base/win/scoped_com_initializer.h" |
| 67 #include "base/win/windows_version.h" | 68 #include "base/win/windows_version.h" |
| 68 #include "ui/base/win/atl_module.h" | 69 #include "ui/base/win/atl_module.h" |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 // On the Mac, this eventually reaches | 651 // On the Mac, this eventually reaches |
| 651 // -[BrowserWindowController windowWillClose:], which will post a deferred | 652 // -[BrowserWindowController windowWillClose:], which will post a deferred |
| 652 // -autorelease on itself to ultimately destroy the Browser object. The line | 653 // -autorelease on itself to ultimately destroy the Browser object. The line |
| 653 // below is necessary to pump these pending messages to ensure all Browsers | 654 // below is necessary to pump these pending messages to ensure all Browsers |
| 654 // get deleted. | 655 // get deleted. |
| 655 content::RunAllPendingInMessageLoop(); | 656 content::RunAllPendingInMessageLoop(); |
| 656 delete autorelease_pool_; | 657 delete autorelease_pool_; |
| 657 autorelease_pool_ = NULL; | 658 autorelease_pool_ = NULL; |
| 658 #endif | 659 #endif |
| 659 } | 660 } |
| OLD | NEW |