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

Side by Side Diff: chrome/browser/extensions/app_process_apitest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/extensions/extension_host.h" 6 #include "chrome/browser/extensions/extension_host.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/extension_system.h" 8 #include "chrome/browser/extensions/extension_system.h"
9 #include "chrome/browser/extensions/process_map.h" 9 #include "chrome/browser/extensions/process_map.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 11 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 13 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/browser_finder.h" 14 #include "chrome/browser/ui/browser_finder.h"
15 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
16 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/extensions/extension.h" 20 #include "chrome/common/extensions/extension.h"
21 #include "chrome/common/extensions/extension_file_util.h" 21 #include "chrome/common/extensions/extension_file_util.h"
22 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
23 #include "content/public/browser/navigation_entry.h" 23 #include "content/public/browser/navigation_entry.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/browser/render_process_host.h" 25 #include "content/public/browser/render_process_host.h"
26 #include "content/public/browser/render_view_host.h" 26 #include "content/public/browser/render_view_host.h"
27 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
28 #include "content/public/test/browser_test_utils.h" 28 #include "content/public/test/browser_test_utils.h"
29 #include "content/public/test/test_navigation_observer.h" 29 #include "content/public/test/test_navigation_observer.h"
30 #include "net/base/mock_host_resolver.h" 30 #include "net/dns/mock_host_resolver.h"
31 #include "sync/api/string_ordinal.h" 31 #include "sync/api/string_ordinal.h"
32 32
33 using content::NavigationController; 33 using content::NavigationController;
34 using content::RenderViewHost; 34 using content::RenderViewHost;
35 using content::WebContents; 35 using content::WebContents;
36 using extensions::Extension; 36 using extensions::Extension;
37 37
38 class AppApiTest : public ExtensionApiTest { 38 class AppApiTest : public ExtensionApiTest {
39 protected: 39 protected:
40 // Gets the base URL for files for a specific test, making sure that it uses 40 // Gets the base URL for files for a specific test, making sure that it uses
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 &browser()->tab_strip_model()->GetActiveWebContents()-> 712 &browser()->tab_strip_model()->GetActiveWebContents()->
713 GetController())); 713 GetController()));
714 chrome::Reload(browser(), CURRENT_TAB); 714 chrome::Reload(browser(), CURRENT_TAB);
715 observer.Wait(); 715 observer.Wait();
716 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( 716 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
717 contents, 717 contents,
718 "window.domAutomationController.send(chrome.app.isInstalled)", 718 "window.domAutomationController.send(chrome.app.isInstalled)",
719 &is_installed)); 719 &is_installed));
720 ASSERT_TRUE(is_installed); 720 ASSERT_TRUE(is_installed);
721 } 721 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698