| 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/extensions/extension_test_message_listener.h" | |
| 11 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "components/translate/core/common/translate_pref_names.h" | 15 #include "components/translate/core/common/translate_pref_names.h" |
| 17 #include "content/public/browser/notification_service.h" | 16 #include "content/public/browser/notification_service.h" |
| 18 #include "extensions/browser/extension_registry.h" | 17 #include "extensions/browser/extension_registry.h" |
| 19 #include "extensions/browser/test_extension_registry_observer.h" | 18 #include "extensions/browser/test_extension_registry_observer.h" |
| 19 #include "extensions/test/extension_test_message_listener.h" |
| 20 #include "extensions/test/result_catcher.h" | 20 #include "extensions/test/result_catcher.h" |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 void ReleaseBrowserProcessModule() { | 24 void ReleaseBrowserProcessModule() { |
| 25 g_browser_process->ReleaseModule(); | 25 g_browser_process->ReleaseModule(); |
| 26 } | 26 } |
| 27 | 27 |
| 28 } // namespace | 28 } // namespace |
| 29 | 29 |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 | 319 |
| 320 // Test 6 - clearDefault | 320 // Test 6 - clearDefault |
| 321 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready | 321 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready |
| 322 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready | 322 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready |
| 323 listener10.Reply("ok"); | 323 listener10.Reply("ok"); |
| 324 listener_incognito10.Reply("ok"); | 324 listener_incognito10.Reply("ok"); |
| 325 | 325 |
| 326 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 326 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 327 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | 327 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); |
| 328 } | 328 } |
| OLD | NEW |