chrome/browser/extensions/extension_nacl_browsertest.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

OLD	NEW
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/command_line.h"	5 #include "base/command_line.h"

6 #include "base/files/file_path.h"	6 #include "base/files/file_path.h"

7 #include "base/path_service.h"	7 #include "base/path_service.h"

8 #include "base/prefs/pref_service.h"

9 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/browser/extensions/crx_installer.h"	9 #include "chrome/browser/extensions/crx_installer.h"

11 #include "chrome/browser/extensions/extension_browsertest.h"	10 #include "chrome/browser/extensions/extension_browsertest.h"

12 #include "chrome/browser/extensions/extension_service.h"	11 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

15 #include "chrome/browser/ui/tabs/tab_strip_model.h"	14 #include "chrome/browser/ui/tabs/tab_strip_model.h"

16 #include "chrome/common/chrome_paths.h"	15 #include "chrome/common/chrome_paths.h"

17 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

18 #include "chrome/test/base/ui_test_utils.h"	17 #include "chrome/test/base/ui_test_utils.h"

	18 #include "components/prefs/pref_service.h"

19 #include "content/public/browser/plugin_service.h"	19 #include "content/public/browser/plugin_service.h"

20 #include "content/public/browser/web_contents.h"	20 #include "content/public/browser/web_contents.h"

21 #include "content/public/common/webplugininfo.h"	21 #include "content/public/common/webplugininfo.h"

22 #include "content/public/test/browser_test_utils.h"	22 #include "content/public/test/browser_test_utils.h"

23 #include "extensions/browser/extension_system.h"	23 #include "extensions/browser/extension_system.h"

24 #include "net/dns/mock_host_resolver.h"	24 #include "net/dns/mock_host_resolver.h"

25 #include "net/test/embedded_test_server/embedded_test_server.h"	25 #include "net/test/embedded_test_server/embedded_test_server.h"

26	26

27 using content::PluginService;	27 using content::PluginService;

28 using content::WebContents;	28 using content::WebContents;

(...skipping 182 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
211 replace_host.SetHostStr("localhost");	211 replace_host.SetHostStr("localhost");

212 replace_host.ClearPort();	212 replace_host.ClearPort();

213 url = url.ReplaceComponents(replace_host);	213 url = url.ReplaceComponents(replace_host);

214	214

215 const Extension* extension = InstallHostedApp();	215 const Extension* extension = InstallHostedApp();

216 ASSERT_TRUE(extension);	216 ASSERT_TRUE(extension);

217 CheckPluginsCreated(url, PLUGIN_TYPE_ALL);	217 CheckPluginsCreated(url, PLUGIN_TYPE_ALL);

218 }	218 }

219	219

220 } // namespace	220 } // namespace

OLD	NEW