| 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" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/test/base/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "components/translate/core/common/translate_pref_names.h" |
| 16 #include "content/public/browser/notification_service.h" | 17 #include "content/public/browser/notification_service.h" |
| 17 | 18 |
| 18 namespace { | 19 namespace { |
| 19 | 20 |
| 20 void ReleaseBrowserProcessModule() { | 21 void ReleaseBrowserProcessModule() { |
| 21 g_browser_process->ReleaseModule(); | 22 g_browser_process->ReleaseModule(); |
| 22 } | 23 } |
| 23 | 24 |
| 24 } // namespace | 25 } // namespace |
| 25 | 26 |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 | 310 |
| 310 // Test 6 - clearDefault | 311 // Test 6 - clearDefault |
| 311 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready | 312 EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready |
| 312 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready | 313 EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready |
| 313 listener10.Reply("ok"); | 314 listener10.Reply("ok"); |
| 314 listener_incognito10.Reply("ok"); | 315 listener_incognito10.Reply("ok"); |
| 315 | 316 |
| 316 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 317 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 317 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | 318 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); |
| 318 } | 319 } |
| OLD | NEW |