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

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

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: 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 <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 24 matching lines...) Expand all
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/resource_type.h"
41 #include "content/public/common/url_constants.h" 41 #include "content/public/common/url_constants.h"
42 #include "content/public/test/browser_test_utils.h" 42 #include "content/public/test/browser_test_utils.h"
43 #include "extensions/browser/extension_system.h" 43 #include "extensions/browser/extension_system.h"
44 #include "extensions/common/switches.h" 44 #include "extensions/common/switches.h"
45 #include "extensions/test/result_catcher.h"
45 #include "net/dns/mock_host_resolver.h" 46 #include "net/dns/mock_host_resolver.h"
46 #include "net/test/embedded_test_server/embedded_test_server.h" 47 #include "net/test/embedded_test_server/embedded_test_server.h"
47 #include "third_party/WebKit/public/web/WebContextMenuData.h" 48 #include "third_party/WebKit/public/web/WebContextMenuData.h"
48 #include "third_party/WebKit/public/web/WebInputEvent.h" 49 #include "third_party/WebKit/public/web/WebInputEvent.h"
49 50
50 using content::ResourceType; 51 using content::ResourceType;
51 using content::WebContents; 52 using content::WebContents;
52 53
53 namespace extensions { 54 namespace extensions {
54 55
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 "extensions/api_test/webnavigation/crash/b.html", 628 "extensions/api_test/webnavigation/crash/b.html",
628 embedded_test_server()->port())); 629 embedded_test_server()->port()));
629 ui_test_utils::NavigateToURL(browser(), url); 630 ui_test_utils::NavigateToURL(browser(), url);
630 631
631 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 632 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
632 } 633 }
633 634
634 #endif 635 #endif
635 636
636 } // namespace extensions 637 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698