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

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

Issue 561813002: Move the logic for creating data: URLs out of DesktopNotificationService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also get rid of GetUIManager() Created 6 years, 3 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 "chrome/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 protected: 159 protected:
160 virtual ~TestExtensionURLRequestContextGetter() {} 160 virtual ~TestExtensionURLRequestContextGetter() {}
161 161
162 private: 162 private:
163 scoped_ptr<net::URLRequestContext> context_; 163 scoped_ptr<net::URLRequestContext> context_;
164 }; 164 };
165 165
166 #if defined(ENABLE_NOTIFICATIONS) 166 #if defined(ENABLE_NOTIFICATIONS)
167 KeyedService* CreateTestDesktopNotificationService( 167 KeyedService* CreateTestDesktopNotificationService(
168 content::BrowserContext* profile) { 168 content::BrowserContext* profile) {
169 return new DesktopNotificationService(static_cast<Profile*>(profile), NULL); 169 return new DesktopNotificationService(static_cast<Profile*>(profile));
170 } 170 }
171 #endif 171 #endif
172 172
173 } // namespace 173 } // namespace
174 174
175 // static 175 // static
176 #if defined(OS_CHROMEOS) 176 #if defined(OS_CHROMEOS)
177 // Must be kept in sync with 177 // Must be kept in sync with
178 // ChromeBrowserMainPartsChromeos::PreEarlyInitialization. 178 // ChromeBrowserMainPartsChromeos::PreEarlyInitialization.
179 const char TestingProfile::kTestUserProfileDir[] = "test-user"; 179 const char TestingProfile::kTestUserProfileDir[] = "test-user";
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 #if defined(ENABLE_EXTENSIONS) 982 #if defined(ENABLE_EXTENSIONS)
983 extension_policy_, 983 extension_policy_,
984 #endif 984 #endif
985 pref_service_.Pass(), 985 pref_service_.Pass(),
986 incognito_, 986 incognito_,
987 guest_session_, 987 guest_session_,
988 supervised_user_id_, 988 supervised_user_id_,
989 policy_service_.Pass(), 989 policy_service_.Pass(),
990 testing_factories_)); 990 testing_factories_));
991 } 991 }
OLDNEW
« chrome/browser/notifications/notification.cc ('K') | « chrome/browser/notifications/notification.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698