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

Side by Side Diff: chrome/test/testing_profile.cc

Issue 6657003: Update a bunch of files to the new location of notification files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 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
« no previous file with comments | « chrome/test/testing_browser_process.h ('k') | chrome/test/ui_test_utils.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/test/testing_profile.h" 5 #include "chrome/test/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/search_engines/template_url_fetcher.h" 33 #include "chrome/browser/search_engines/template_url_fetcher.h"
34 #include "chrome/browser/search_engines/template_url_model.h" 34 #include "chrome/browser/search_engines/template_url_model.h"
35 #include "chrome/browser/sessions/session_service.h" 35 #include "chrome/browser/sessions/session_service.h"
36 #include "chrome/browser/sync/profile_sync_service_mock.h" 36 #include "chrome/browser/sync/profile_sync_service_mock.h"
37 #include "chrome/browser/themes/browser_theme_provider.h" 37 #include "chrome/browser/themes/browser_theme_provider.h"
38 #include "chrome/browser/ui/find_bar/find_bar_state.h" 38 #include "chrome/browser/ui/find_bar/find_bar_state.h"
39 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 39 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
40 #include "chrome/browser/ui/webui/ntp_resource_cache.h" 40 #include "chrome/browser/ui/webui/ntp_resource_cache.h"
41 #include "chrome/common/chrome_constants.h" 41 #include "chrome/common/chrome_constants.h"
42 #include "chrome/common/net/url_request_context_getter.h" 42 #include "chrome/common/net/url_request_context_getter.h"
43 #include "chrome/common/notification_service.h"
44 #include "chrome/common/url_constants.h" 43 #include "chrome/common/url_constants.h"
45 #include "chrome/test/test_url_request_context_getter.h" 44 #include "chrome/test/test_url_request_context_getter.h"
46 #include "chrome/test/testing_pref_service.h" 45 #include "chrome/test/testing_pref_service.h"
47 #include "chrome/test/ui_test_utils.h" 46 #include "chrome/test/ui_test_utils.h"
48 #include "content/browser/browser_thread.h" 47 #include "content/browser/browser_thread.h"
49 #include "content/browser/geolocation/geolocation_permission_context.h" 48 #include "content/browser/geolocation/geolocation_permission_context.h"
50 #include "content/browser/in_process_webkit/webkit_context.h" 49 #include "content/browser/in_process_webkit/webkit_context.h"
50 #include "content/common/notification_service.h"
51 #include "net/base/cookie_monster.h" 51 #include "net/base/cookie_monster.h"
52 #include "net/url_request/url_request_context.h" 52 #include "net/url_request/url_request_context.h"
53 #include "net/url_request/url_request_test_util.h" 53 #include "net/url_request/url_request_test_util.h"
54 #include "testing/gmock/include/gmock/gmock.h" 54 #include "testing/gmock/include/gmock/gmock.h"
55 #include "webkit/database/database_tracker.h" 55 #include "webkit/database/database_tracker.h"
56 56
57 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) 57 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
58 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 58 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
59 #endif 59 #endif
60 60
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 } 807 }
808 808
809 DerivedTestingProfile::DerivedTestingProfile(Profile* profile) 809 DerivedTestingProfile::DerivedTestingProfile(Profile* profile)
810 : original_profile_(profile) {} 810 : original_profile_(profile) {}
811 811
812 DerivedTestingProfile::~DerivedTestingProfile() {} 812 DerivedTestingProfile::~DerivedTestingProfile() {}
813 813
814 ProfileId DerivedTestingProfile::GetRuntimeId() { 814 ProfileId DerivedTestingProfile::GetRuntimeId() {
815 return original_profile_->GetRuntimeId(); 815 return original_profile_->GetRuntimeId();
816 } 816 }
OLDNEW
« no previous file with comments | « chrome/test/testing_browser_process.h ('k') | chrome/test/ui_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698