| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/extensions/app_notify_channel_setup.h" | 6 #include "chrome/browser/extensions/app_notify_channel_setup.h" |
| 7 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_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" |
| 11 #include "chrome/browser/ui/extensions/application_launch.h" |
| 11 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/extensions/extension.h" | 13 #include "chrome/common/extensions/extension.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 14 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 15 | 16 |
| 16 using content::BrowserThread; | 17 using content::BrowserThread; |
| 17 | 18 |
| 18 class AppNotificationTest : public ExtensionBrowserTest {}; | 19 class AppNotificationTest : public ExtensionBrowserTest {}; |
| 19 | 20 |
| 20 namespace { | 21 namespace { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 51 // A test that makes sure we properly save the client id we were passed when | 52 // A test that makes sure we properly save the client id we were passed when |
| 52 // the app called the getNotificationChannel API. | 53 // the app called the getNotificationChannel API. |
| 53 IN_PROC_BROWSER_TEST_F(AppNotificationTest, SaveClientId) { | 54 IN_PROC_BROWSER_TEST_F(AppNotificationTest, SaveClientId) { |
| 54 Interceptor interceptor; | 55 Interceptor interceptor; |
| 55 AppNotifyChannelSetup::SetInterceptorForTests(&interceptor); | 56 AppNotifyChannelSetup::SetInterceptorForTests(&interceptor); |
| 56 | 57 |
| 57 const Extension* app = | 58 const Extension* app = |
| 58 LoadExtension(test_data_dir_.AppendASCII("app_notifications")); | 59 LoadExtension(test_data_dir_.AppendASCII("app_notifications")); |
| 59 ASSERT_TRUE(app != NULL); | 60 ASSERT_TRUE(app != NULL); |
| 60 | 61 |
| 61 Browser::OpenApplication(browser()->profile(), | 62 ApplicationLaunch::OpenApplication(browser()->profile(), |
| 62 app, | 63 app, |
| 63 extension_misc::LAUNCH_TAB, | 64 extension_misc::LAUNCH_TAB, |
| 64 GURL(), | 65 GURL(), |
| 65 NEW_FOREGROUND_TAB); | 66 NEW_FOREGROUND_TAB); |
| 66 if (!interceptor.was_called()) | 67 if (!interceptor.was_called()) |
| 67 ui_test_utils::RunMessageLoop(); | 68 ui_test_utils::RunMessageLoop(); |
| 68 EXPECT_TRUE(interceptor.was_called()); | 69 EXPECT_TRUE(interceptor.was_called()); |
| 69 | 70 |
| 70 ExtensionService* service = browser()->profile()->GetExtensionService(); | 71 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 71 ExtensionPrefs* prefs = service->extension_prefs(); | 72 ExtensionPrefs* prefs = service->extension_prefs(); |
| 72 std::string saved_id = prefs->GetAppNotificationClientId(app->id()); | 73 std::string saved_id = prefs->GetAppNotificationClientId(app->id()); |
| 73 EXPECT_EQ(kExpectedClientId, saved_id); | 74 EXPECT_EQ(kExpectedClientId, saved_id); |
| 74 } | 75 } |
| OLD | NEW |