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 "base/location.h" | 5 #include "base/location.h" |
6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 } | 218 } |
219 | 219 |
220 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, OnChangeSplit) { | 220 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, OnChangeSplit) { |
221 extensions::ResultCatcher catcher; | 221 extensions::ResultCatcher catcher; |
222 catcher.RestrictToBrowserContext(profile_); | 222 catcher.RestrictToBrowserContext(profile_); |
223 extensions::ResultCatcher catcher_incognito; | 223 extensions::ResultCatcher catcher_incognito; |
224 catcher_incognito.RestrictToBrowserContext( | 224 catcher_incognito.RestrictToBrowserContext( |
225 profile_->GetOffTheRecordProfile()); | 225 profile_->GetOffTheRecordProfile()); |
226 | 226 |
227 // Open an incognito window. | 227 // Open an incognito window. |
228 ui_test_utils::OpenURLOffTheRecord(profile_, GURL("chrome://newtab/")); | 228 OpenURLOffTheRecord(profile_, GURL("chrome://newtab/")); |
229 | 229 |
230 // changeDefault listeners. | 230 // changeDefault listeners. |
231 ExtensionTestMessageListener listener1("changeDefault regular ready", true); | 231 ExtensionTestMessageListener listener1("changeDefault regular ready", true); |
232 ExtensionTestMessageListener listener_incognito1( | 232 ExtensionTestMessageListener listener_incognito1( |
233 "changeDefault incognito ready", true); | 233 "changeDefault incognito ready", true); |
234 | 234 |
235 // changeIncognitoOnly listeners. | 235 // changeIncognitoOnly listeners. |
236 ExtensionTestMessageListener listener2( | 236 ExtensionTestMessageListener listener2( |
237 "changeIncognitoOnly regular ready", true); | 237 "changeIncognitoOnly regular ready", true); |
238 ExtensionTestMessageListener listener_incognito2( | 238 ExtensionTestMessageListener listener_incognito2( |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 | 340 |
341 #if defined(OS_WIN) // http://crbug.com/477844 | 341 #if defined(OS_WIN) // http://crbug.com/477844 |
342 #define MAYBE_DataReductionProxy DISABLED_DataReductionProxy | 342 #define MAYBE_DataReductionProxy DISABLED_DataReductionProxy |
343 #else | 343 #else |
344 #define MAYBE_DataReductionProxy DataReductionProxy | 344 #define MAYBE_DataReductionProxy DataReductionProxy |
345 #endif | 345 #endif |
346 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_DataReductionProxy) { | 346 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_DataReductionProxy) { |
347 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) << | 347 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) << |
348 message_; | 348 message_; |
349 } | 349 } |
OLD | NEW |