OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/gtest_prod_util.h" | 7 #include "base/gtest_prod_util.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "chrome/browser/background/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 | 43 |
44 DISALLOW_COPY_AND_ASSIGN(TestBackgroundModeManager); | 44 DISALLOW_COPY_AND_ASSIGN(TestBackgroundModeManager); |
45 }; | 45 }; |
46 | 46 |
47 class BackgroundAppBrowserTest: public ExtensionBrowserTest {}; | 47 class BackgroundAppBrowserTest: public ExtensionBrowserTest {}; |
48 | 48 |
49 // Tests that if we reload a background app, we don't get a popup bubble | 49 // Tests that if we reload a background app, we don't get a popup bubble |
50 // telling us that a new background app has been installed. | 50 // telling us that a new background app has been installed. |
51 IN_PROC_BROWSER_TEST_F(BackgroundAppBrowserTest, ReloadBackgroundApp) { | 51 IN_PROC_BROWSER_TEST_F(BackgroundAppBrowserTest, ReloadBackgroundApp) { |
52 // Pass this in to the browser test. | 52 // Pass this in to the browser test. |
53 scoped_ptr<BackgroundModeManager> test_background_mode_manager( | 53 std::unique_ptr<BackgroundModeManager> test_background_mode_manager( |
54 new TestBackgroundModeManager( | 54 new TestBackgroundModeManager(*base::CommandLine::ForCurrentProcess(), |
55 *base::CommandLine::ForCurrentProcess(), | 55 &(g_browser_process->profile_manager() |
56 &(g_browser_process->profile_manager()-> | 56 ->GetProfileAttributesStorage()))); |
57 GetProfileAttributesStorage()))); | |
58 g_browser_process->set_background_mode_manager_for_test( | 57 g_browser_process->set_background_mode_manager_for_test( |
59 std::move(test_background_mode_manager)); | 58 std::move(test_background_mode_manager)); |
60 TestBackgroundModeManager* manager = | 59 TestBackgroundModeManager* manager = |
61 reinterpret_cast<TestBackgroundModeManager*>( | 60 reinterpret_cast<TestBackgroundModeManager*>( |
62 g_browser_process->background_mode_manager()); | 61 g_browser_process->background_mode_manager()); |
63 | 62 |
64 // Load our background extension | 63 // Load our background extension |
65 ASSERT_FALSE( | 64 ASSERT_FALSE( |
66 manager->showed_background_app_installed_notification_for_test()); | 65 manager->showed_background_app_installed_notification_for_test()); |
67 const extensions::Extension* extension = LoadExtension( | 66 const extensions::Extension* extension = LoadExtension( |
68 test_data_dir_.AppendASCII("background_app")); | 67 test_data_dir_.AppendASCII("background_app")); |
69 ASSERT_FALSE(extension == NULL); | 68 ASSERT_FALSE(extension == NULL); |
70 | 69 |
71 // Set the test flag to not shown. | 70 // Set the test flag to not shown. |
72 manager->set_showed_background_app_installed_notification_for_test(false); | 71 manager->set_showed_background_app_installed_notification_for_test(false); |
73 | 72 |
74 // Reload our background extension | 73 // Reload our background extension |
75 ReloadExtension(extension->id()); | 74 ReloadExtension(extension->id()); |
76 | 75 |
77 // Ensure that we did not see a "Background extension loaded" dialog. | 76 // Ensure that we did not see a "Background extension loaded" dialog. |
78 EXPECT_FALSE( | 77 EXPECT_FALSE( |
79 manager->showed_background_app_installed_notification_for_test()); | 78 manager->showed_background_app_installed_notification_for_test()); |
80 } | 79 } |
OLD | NEW |