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

Side by Side Diff: chrome/browser/ui/panels/panel_browsertest.cc

Issue 541743002: Move url_request_mock_http_job to net/test/url_request/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 3 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/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/devtools/devtools_window.h" 10 #include "chrome/browser/devtools/devtools_window.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "chrome/test/base/interactive_test_utils.h" 32 #include "chrome/test/base/interactive_test_utils.h"
33 #include "chrome/test/base/ui_test_utils.h" 33 #include "chrome/test/base/ui_test_utils.h"
34 #include "content/public/browser/native_web_keyboard_event.h" 34 #include "content/public/browser/native_web_keyboard_event.h"
35 #include "content/public/browser/notification_service.h" 35 #include "content/public/browser/notification_service.h"
36 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
37 #include "content/public/common/url_constants.h" 37 #include "content/public/common/url_constants.h"
38 #include "content/public/test/browser_test_utils.h" 38 #include "content/public/test/browser_test_utils.h"
39 #include "content/test/net/url_request_mock_http_job.h"
40 #include "extensions/common/constants.h" 39 #include "extensions/common/constants.h"
41 #include "net/base/net_util.h" 40 #include "net/base/net_util.h"
41 #include "net/test/url_request/url_request_mock_http_job.h"
42 #include "testing/gtest/include/gtest/gtest.h" 42 #include "testing/gtest/include/gtest/gtest.h"
43 #include "ui/base/hit_test.h" 43 #include "ui/base/hit_test.h"
44 #include "ui/events/event_utils.h" 44 #include "ui/events/event_utils.h"
45 #include "ui/gfx/screen.h" 45 #include "ui/gfx/screen.h"
46 46
47 using content::WebContents; 47 using content::WebContents;
48 48
49 class PanelBrowserTest : public BasePanelBrowserTest { 49 class PanelBrowserTest : public BasePanelBrowserTest {
50 public: 50 public:
51 PanelBrowserTest() : BasePanelBrowserTest() { 51 PanelBrowserTest() : BasePanelBrowserTest() {
(...skipping 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1773 #else 1773 #else
1774 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize 1774 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize
1775 #endif 1775 #endif
1776 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest, 1776 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest,
1777 MAYBE_FocusChangeEventOnMinimize) { 1777 MAYBE_FocusChangeEventOnMinimize) {
1778 // This is needed so the subsequently created panels can be activated. 1778 // This is needed so the subsequently created panels can be activated.
1779 // On a Mac, it transforms background-only test process into foreground one. 1779 // On a Mac, it transforms background-only test process into foreground one.
1780 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); 1780 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
1781 ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_; 1781 ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_;
1782 } 1782 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_tracker_unittest.cc ('k') | chrome/browser/unload_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698