| 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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_test_message_listener.h" | 7 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 8 #include "chrome/browser/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 | 230 |
| 231 // Test 6 - clearDefault | 231 // Test 6 - clearDefault |
| 232 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready | 232 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready |
| 233 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready | 233 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready |
| 234 listener10.Reply("ok"); | 234 listener10.Reply("ok"); |
| 235 listener_incognito10.Reply("ok"); | 235 listener_incognito10.Reply("ok"); |
| 236 | 236 |
| 237 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 237 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 238 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | 238 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); |
| 239 } | 239 } |
| OLD | NEW |