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 <set> | 5 #include <set> |
6 #include <string> | 6 #include <string> |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/hash_tables.h" | 10 #include "base/hash_tables.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "content/public/browser/notification_registrar.h" | 26 #include "content/public/browser/notification_registrar.h" |
27 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" |
28 #include "content/public/browser/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
29 #include "content/public/test/mock_render_process_host.h" | 29 #include "content/public/test/mock_render_process_host.h" |
30 #include "content/public/test/test_browser_thread.h" | 30 #include "content/public/test/test_browser_thread.h" |
31 #include "content/public/test/test_renderer_host.h" | 31 #include "content/public/test/test_renderer_host.h" |
32 #include "content/public/test/web_contents_tester.h" | 32 #include "content/public/test/web_contents_tester.h" |
33 #include "testing/gtest/include/gtest/gtest.h" | 33 #include "testing/gtest/include/gtest/gtest.h" |
34 | 34 |
35 #if defined(OS_ANDROID) | 35 #if defined(OS_ANDROID) |
36 #include "chrome/browser/prefs/pref_service.h" | 36 #include "base/prefs/pref_service.h" |
| 37 #include "chrome/browser/android/mock_google_location_settings_helper.h" |
37 #include "chrome/common/pref_names.h" | 38 #include "chrome/common/pref_names.h" |
38 #include "chrome/browser/android/mock_google_location_settings_helper.h" | |
39 #endif | 39 #endif |
40 | 40 |
41 using content::MockRenderProcessHost; | 41 using content::MockRenderProcessHost; |
42 | 42 |
43 | 43 |
44 // ClosedDelegateTracker ------------------------------------------------------ | 44 // ClosedDelegateTracker ------------------------------------------------------ |
45 | 45 |
46 // We need to track which infobars were closed. | 46 // We need to track which infobars were closed. |
47 class ClosedDelegateTracker : public content::NotificationObserver { | 47 class ClosedDelegateTracker : public content::NotificationObserver { |
48 public: | 48 public: |
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
700 details.entry = web_contents()->GetController().GetLastCommittedEntry(); | 700 details.entry = web_contents()->GetController().GetLastCommittedEntry(); |
701 EXPECT_FALSE(infobar_0->ShouldExpire(details)); | 701 EXPECT_FALSE(infobar_0->ShouldExpire(details)); |
702 // Ensure the infobar will expire when we commit the pending navigation. | 702 // Ensure the infobar will expire when we commit the pending navigation. |
703 details.entry = web_contents()->GetController().GetActiveEntry(); | 703 details.entry = web_contents()->GetController().GetActiveEntry(); |
704 EXPECT_TRUE(infobar_0->ShouldExpire(details)); | 704 EXPECT_TRUE(infobar_0->ShouldExpire(details)); |
705 | 705 |
706 // Delete the tab contents. | 706 // Delete the tab contents. |
707 DeleteContents(); | 707 DeleteContents(); |
708 delete infobar_0; | 708 delete infobar_0; |
709 } | 709 } |
OLD | NEW |