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

Side by Side Diff: chrome/browser/external_extension_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
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
12 #include "build/build_config.h" 11 #include "build/build_config.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_switches.h" 15 #include "chrome/common/chrome_switches.h"
17 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
18 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
19 #include "components/google/core/browser/google_switches.h" 18 #include "components/google/core/browser/google_switches.h"
19 #include "components/prefs/pref_service.h"
20 #include "components/search_engines/search_engines_pref_names.h" 20 #include "components/search_engines/search_engines_pref_names.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "content/public/common/url_constants.h" 22 #include "content/public/common/url_constants.h"
23 #include "content/public/test/browser_test_utils.h" 23 #include "content/public/test/browser_test_utils.h"
24 #include "net/test/embedded_test_server/embedded_test_server.h" 24 #include "net/test/embedded_test_server/embedded_test_server.h"
25 25
26 namespace { 26 namespace {
27 27
28 struct IsSearchProviderTestData { 28 struct IsSearchProviderTestData {
29 IsSearchProviderTestData() : tab(NULL) {} 29 IsSearchProviderTestData() : tab(NULL) {}
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 IN_PROC_BROWSER_TEST_F(SearchProviderTest, 156 IN_PROC_BROWSER_TEST_F(SearchProviderTest,
157 TestIsSearchProviderInstalledWithException) { 157 TestIsSearchProviderInstalledWithException) {
158 // Change the url for the test page to one that throws an exception when 158 // Change the url for the test page to one that throws an exception when
159 // toString is called on the argument given to isSearchProviderInstalled. 159 // toString is called on the argument given to isSearchProviderInstalled.
160 search_provider_test_url_ = embedded_test_server()->GetURL( 160 search_provider_test_url_ = embedded_test_server()->GetURL(
161 "/is_search_provider_installed_with_exception.html"); 161 "/is_search_provider_installed_with_exception.html");
162 162
163 FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest( 163 FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest(
164 browser(), "www.google.com", "")); 164 browser(), "www.google.com", ""));
165 } 165 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/updater/extension_updater.cc ('k') | chrome/browser/external_protocol/external_protocol_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698