| OLD | NEW |
| 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 "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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); | 144 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); |
| 145 } | 145 } |
| 146 | 146 |
| 147 protected: | 147 protected: |
| 148 virtual ~TestExtensionURLRequestContextGetter() {} | 148 virtual ~TestExtensionURLRequestContextGetter() {} |
| 149 | 149 |
| 150 private: | 150 private: |
| 151 scoped_ptr<net::URLRequestContext> context_; | 151 scoped_ptr<net::URLRequestContext> context_; |
| 152 }; | 152 }; |
| 153 | 153 |
| 154 #if defined(ENABLE_NOTIFICATIONS) |
| 154 BrowserContextKeyedService* CreateTestDesktopNotificationService( | 155 BrowserContextKeyedService* CreateTestDesktopNotificationService( |
| 155 content::BrowserContext* profile) { | 156 content::BrowserContext* profile) { |
| 156 #if defined(ENABLE_NOTIFICATIONS) | |
| 157 return new DesktopNotificationService(static_cast<Profile*>(profile), NULL); | 157 return new DesktopNotificationService(static_cast<Profile*>(profile), NULL); |
| 158 #else | 158 } |
| 159 return NULL; | |
| 160 #endif | 159 #endif |
| 161 } | |
| 162 | 160 |
| 163 } // namespace | 161 } // namespace |
| 164 | 162 |
| 165 // static | 163 // static |
| 166 #if defined(OS_CHROMEOS) | 164 #if defined(OS_CHROMEOS) |
| 167 // Must be kept in sync with | 165 // Must be kept in sync with |
| 168 // ChromeBrowserMainPartsChromeos::PreEarlyInitialization. | 166 // ChromeBrowserMainPartsChromeos::PreEarlyInitialization. |
| 169 const char TestingProfile::kTestUserProfileDir[] = "test-user"; | 167 const char TestingProfile::kTestUserProfileDir[] = "test-user"; |
| 170 #else | 168 #else |
| 171 const char TestingProfile::kTestUserProfileDir[] = "Default"; | 169 const char TestingProfile::kTestUserProfileDir[] = "Default"; |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 | 898 |
| 901 return scoped_ptr<TestingProfile>(new TestingProfile( | 899 return scoped_ptr<TestingProfile>(new TestingProfile( |
| 902 path_, | 900 path_, |
| 903 delegate_, | 901 delegate_, |
| 904 extension_policy_, | 902 extension_policy_, |
| 905 pref_service_.Pass(), | 903 pref_service_.Pass(), |
| 906 incognito_, | 904 incognito_, |
| 907 managed_user_id_, | 905 managed_user_id_, |
| 908 testing_factories_)); | 906 testing_factories_)); |
| 909 } | 907 } |
| OLD | NEW |