| 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/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/net/prediction_options.h" | 10 #include "chrome/browser/net/prediction_options.h" |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 // Test 6 - clearDefault | 327 // Test 6 - clearDefault |
| 328 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready | 328 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready |
| 329 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready | 329 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready |
| 330 listener10.Reply("ok"); | 330 listener10.Reply("ok"); |
| 331 listener_incognito10.Reply("ok"); | 331 listener_incognito10.Reply("ok"); |
| 332 | 332 |
| 333 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 333 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 334 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | 334 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); |
| 335 } | 335 } |
| 336 | 336 |
| 337 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, DataReductionProxy) { | 337 #if defined(OS_WIN) // http://crbug.com/477844 |
| 338 #define MAYBE_DataReductionProxy DISABLED_DataReductionProxy |
| 339 #else |
| 340 #define MAYBE_DataReductionProxy DataReductionProxy |
| 341 #endif |
| 342 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_DataReductionProxy) { |
| 338 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) << | 343 EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) << |
| 339 message_; | 344 message_; |
| 340 } | 345 } |
| OLD | NEW |