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

Side by Side Diff: chrome/browser/profiles/profile_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
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/prefs/pref_service.h"
18 #include "base/sequenced_task_runner.h" 17 #include "base/sequenced_task_runner.h"
19 #include "base/synchronization/waitable_event.h" 18 #include "base/synchronization/waitable_event.h"
20 #include "base/values.h" 19 #include "base/values.h"
21 #include "base/version.h" 20 #include "base/version.h"
22 #include "build/build_config.h" 21 #include "build/build_config.h"
23 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/chrome_notification_types.h" 23 #include "chrome/browser/chrome_notification_types.h"
25 #include "chrome/browser/net/url_request_mock_util.h" 24 #include "chrome/browser/net/url_request_mock_util.h"
26 #include "chrome/browser/profiles/chrome_version_service.h" 25 #include "chrome/browser/profiles/chrome_version_service.h"
27 #include "chrome/browser/profiles/profile_impl.h" 26 #include "chrome/browser/profiles/profile_impl.h"
28 #include "chrome/browser/profiles/profile_manager.h" 27 #include "chrome/browser/profiles/profile_manager.h"
29 #include "chrome/browser/ui/browser.h" 28 #include "chrome/browser/ui/browser.h"
30 #include "chrome/browser/ui/tabs/tab_strip_model.h" 29 #include "chrome/browser/ui/tabs/tab_strip_model.h"
31 #include "chrome/common/chrome_constants.h" 30 #include "chrome/common/chrome_constants.h"
32 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
33 #include "chrome/test/base/in_process_browser_test.h" 32 #include "chrome/test/base/in_process_browser_test.h"
34 #include "chrome/test/base/ui_test_utils.h" 33 #include "chrome/test/base/ui_test_utils.h"
35 #include "components/bookmarks/browser/startup_task_runner_service.h" 34 #include "components/bookmarks/browser/startup_task_runner_service.h"
35 #include "components/prefs/pref_service.h"
36 #include "components/version_info/version_info.h" 36 #include "components/version_info/version_info.h"
37 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
38 #include "content/public/test/test_utils.h" 38 #include "content/public/test/test_utils.h"
39 #include "net/base/net_errors.h" 39 #include "net/base/net_errors.h"
40 #include "net/test/url_request/url_request_failed_job.h" 40 #include "net/test/url_request/url_request_failed_job.h"
41 #include "net/url_request/url_fetcher.h" 41 #include "net/url_request/url_fetcher.h"
42 #include "net/url_request/url_fetcher_delegate.h" 42 #include "net/url_request/url_fetcher_delegate.h"
43 #include "net/url_request/url_request_context_getter.h" 43 #include "net/url_request/url_request_context_getter.h"
44 #include "net/url_request/url_request_status.h" 44 #include "net/url_request/url_request_status.h"
45 #include "testing/gmock/include/gmock/gmock.h" 45 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 546
547 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, 547 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
548 URLFetcherUsingExtensionContextDuringIncognitoTeardown) { 548 URLFetcherUsingExtensionContextDuringIncognitoTeardown) {
549 Browser* incognito_browser = 549 Browser* incognito_browser =
550 OpenURLOffTheRecord(browser()->profile(), GURL("about:blank")); 550 OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
551 551
552 RunURLFetcherActiveDuringIncognitoTeardownTest( 552 RunURLFetcherActiveDuringIncognitoTeardownTest(
553 incognito_browser, 553 incognito_browser,
554 incognito_browser->profile()->GetRequestContextForExtensions()); 554 incognito_browser->profile()->GetRequestContextForExtensions());
555 } 555 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698