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

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

Issue 9425026: Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't u… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix race condition Created 8 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 | Annotate | Revision Log
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 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_ 5 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_ 6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/scoped_temp_dir.h" 13 #include "base/scoped_temp_dir.h"
14 #include "base/timer.h" 14 #include "base/timer.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "content/browser/appcache/chrome_appcache_service.h" 16 #include "content/browser/appcache/chrome_appcache_service.h"
17 17
18 namespace content { 18 namespace content {
19 class MockResourceContext;
19 class SpeechInputPreferences; 20 class SpeechInputPreferences;
20 } 21 }
21 22
22 namespace history { 23 namespace history {
23 class TopSites; 24 class TopSites;
24 } 25 }
25 26
26 namespace net { 27 namespace net {
27 class CookieMonster; 28 class CookieMonster;
28 class URLRequestContextGetter; 29 class URLRequestContextGetter;
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 // cases. 378 // cases.
378 FilePath profile_path_; 379 FilePath profile_path_;
379 380
380 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_; 381 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
381 382
382 // We keep a weak pointer to the dependency manager we want to notify on our 383 // We keep a weak pointer to the dependency manager we want to notify on our
383 // death. Defaults to the Singleton implementation but overridable for 384 // death. Defaults to the Singleton implementation but overridable for
384 // testing. 385 // testing.
385 ProfileDependencyManager* profile_dependency_manager_; 386 ProfileDependencyManager* profile_dependency_manager_;
386 387
388 scoped_ptr<content::MockResourceContext> resource_context_;
389
387 // Weak pointer to a delegate for indicating that a profile was created. 390 // Weak pointer to a delegate for indicating that a profile was created.
388 Delegate* delegate_; 391 Delegate* delegate_;
389 }; 392 };
390 393
391 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 394 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698