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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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
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 <list> 5 #include <list>
6 #include <set> 6 #include <set>
7 7
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/test/base/ui_test_utils.h" 30 #include "chrome/test/base/ui_test_utils.h"
31 #include "content/public/browser/browser_thread.h" 31 #include "content/public/browser/browser_thread.h"
32 #include "content/public/browser/render_frame_host.h" 32 #include "content/public/browser/render_frame_host.h"
33 #include "content/public/browser/render_process_host.h" 33 #include "content/public/browser/render_process_host.h"
34 #include "content/public/browser/render_view_host.h" 34 #include "content/public/browser/render_view_host.h"
35 #include "content/public/browser/resource_controller.h" 35 #include "content/public/browser/resource_controller.h"
36 #include "content/public/browser/resource_dispatcher_host.h" 36 #include "content/public/browser/resource_dispatcher_host.h"
37 #include "content/public/browser/resource_throttle.h" 37 #include "content/public/browser/resource_throttle.h"
38 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
39 #include "content/public/common/context_menu_params.h" 39 #include "content/public/common/context_menu_params.h"
40 #include "content/public/common/resource_type.h"
40 #include "content/public/common/url_constants.h" 41 #include "content/public/common/url_constants.h"
41 #include "content/public/test/browser_test_utils.h" 42 #include "content/public/test/browser_test_utils.h"
42 #include "extensions/browser/extension_system.h" 43 #include "extensions/browser/extension_system.h"
43 #include "extensions/common/switches.h" 44 #include "extensions/common/switches.h"
44 #include "net/dns/mock_host_resolver.h" 45 #include "net/dns/mock_host_resolver.h"
45 #include "net/test/embedded_test_server/embedded_test_server.h" 46 #include "net/test/embedded_test_server/embedded_test_server.h"
46 #include "third_party/WebKit/public/web/WebContextMenuData.h" 47 #include "third_party/WebKit/public/web/WebContextMenuData.h"
47 #include "third_party/WebKit/public/web/WebInputEvent.h" 48 #include "third_party/WebKit/public/web/WebInputEvent.h"
48 #include "webkit/common/resource_type.h"
49 49
50 using content::ResourceType;
50 using content::WebContents; 51 using content::WebContents;
51 52
52 namespace extensions { 53 namespace extensions {
53 54
54 namespace { 55 namespace {
55 56
56 // This class can defer requests for arbitrary URLs. 57 // This class can defer requests for arbitrary URLs.
57 class TestNavigationListener 58 class TestNavigationListener
58 : public base::RefCountedThreadSafe<TestNavigationListener> { 59 : public base::RefCountedThreadSafe<TestNavigationListener> {
59 public: 60 public:
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 "extensions/api_test/webnavigation/crash/b.html", 631 "extensions/api_test/webnavigation/crash/b.html",
631 embedded_test_server()->port())); 632 embedded_test_server()->port()));
632 ui_test_utils::NavigateToURL(browser(), url); 633 ui_test_utils::NavigateToURL(browser(), url);
633 634
634 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 635 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
635 } 636 }
636 637
637 #endif 638 #endif
638 639
639 } // namespace extensions 640 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698