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

Side by Side Diff: chrome/browser/extensions/process_management_browsertest.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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_host.h" 7 #include "chrome/browser/extensions/extension_host.h"
8 #include "chrome/browser/extensions/extension_process_manager.h" 8 #include "chrome/browser/extensions/extension_process_manager.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/render_process_host.h" 18 #include "content/public/browser/render_process_host.h"
19 #include "content/public/browser/render_view_host.h" 19 #include "content/public/browser/render_view_host.h"
20 #include "content/public/browser/site_instance.h" 20 #include "content/public/browser/site_instance.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "net/base/mock_host_resolver.h" 22 #include "net/dns/mock_host_resolver.h"
23 23
24 using content::NavigationController; 24 using content::NavigationController;
25 using content::WebContents; 25 using content::WebContents;
26 26
27 namespace { 27 namespace {
28 28
29 class ProcessManagementTest : public ExtensionBrowserTest { 29 class ProcessManagementTest : public ExtensionBrowserTest {
30 private: 30 private:
31 // This is needed for testing isolated apps, which are still experimental. 31 // This is needed for testing isolated apps, which are still experimental.
32 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 32 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 // We've loaded 5 extensions with background pages, 1 extension without 235 // We've loaded 5 extensions with background pages, 1 extension without
236 // background page, and one isolated app. We expect only 2 unique processes 236 // background page, and one isolated app. We expect only 2 unique processes
237 // hosting those extensions. 237 // hosting those extensions.
238 ExtensionService* service = 238 ExtensionService* service =
239 extensions::ExtensionSystem::Get(profile)->extension_service(); 239 extensions::ExtensionSystem::Get(profile)->extension_service();
240 240
241 EXPECT_GE((size_t) 6, service->process_map()->size()); 241 EXPECT_GE((size_t) 6, service->process_map()->size());
242 EXPECT_EQ((size_t) 2, process_ids.size()); 242 EXPECT_EQ((size_t) 2, process_ids.size());
243 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698