Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Side by Side Diff: chrome/browser/chromeos/extensions/input_view_browsertest.cc

Issue 425303002: Move extension notifications to extensions/browser/notification_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (extension-notifications) rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" 7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h"
8 #include "chrome/browser/extensions/crx_installer.h" 8 #include "chrome/browser/extensions/crx_installer.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_test_notification_observer.h" 10 #include "chrome/browser/extensions/extension_test_notification_observer.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/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "chromeos/ime/extension_ime_util.h" 14 #include "chromeos/ime/extension_ime_util.h"
15 #include "chromeos/ime/input_method_manager.h" 15 #include "chromeos/ime/input_method_manager.h"
16 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
17 #include "content/public/browser/site_instance.h" 17 #include "content/public/browser/site_instance.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 #include "content/public/common/url_constants.h" 19 #include "content/public/common/url_constants.h"
20 #include "content/public/test/browser_test_utils.h" 20 #include "content/public/test/browser_test_utils.h"
21 #include "extensions/browser/extension_system.h" 21 #include "extensions/browser/extension_system.h"
22 #include "extensions/browser/notification_types.h"
22 #include "extensions/common/constants.h" 23 #include "extensions/common/constants.h"
23 #include "extensions/common/extension.h" 24 #include "extensions/common/extension.h"
24 #include "extensions/common/file_util.h" 25 #include "extensions/common/file_util.h"
25 #include "ui/aura/client/aura_constants.h" 26 #include "ui/aura/client/aura_constants.h"
26 #include "ui/base/ime/input_method.h" 27 #include "ui/base/ime/input_method.h"
27 28
28 namespace { 29 namespace {
29 30
30 const base::FilePath::CharType kExtensionName[] = "GoogleKeyboardInput-xkb.crx"; 31 const base::FilePath::CharType kExtensionName[] = "GoogleKeyboardInput-xkb.crx";
31 32
(...skipping 23 matching lines...) Expand all
55 std::string InstallIMEExtension() { 56 std::string InstallIMEExtension() {
56 // Loads extension. 57 // Loads extension.
57 base::FilePath path = ui_test_utils::GetTestFilePath( 58 base::FilePath path = ui_test_utils::GetTestFilePath(
58 base::FilePath(kInputViewTestDir), base::FilePath(kExtensionName)); 59 base::FilePath(kInputViewTestDir), base::FilePath(kExtensionName));
59 ExtensionService* service = extensions::ExtensionSystem::Get( 60 ExtensionService* service = extensions::ExtensionSystem::Get(
60 browser()->profile())->extension_service(); 61 browser()->profile())->extension_service();
61 scoped_refptr<extensions::CrxInstaller> installer = 62 scoped_refptr<extensions::CrxInstaller> installer =
62 extensions::CrxInstaller::CreateSilent(service); 63 extensions::CrxInstaller::CreateSilent(service);
63 64
64 ExtensionTestNotificationObserver observer(browser()); 65 ExtensionTestNotificationObserver observer(browser());
65 observer.Watch(chrome::NOTIFICATION_CRX_INSTALLER_DONE, 66 observer.Watch(extensions::NOTIFICATION_CRX_INSTALLER_DONE,
66 content::Source<extensions::CrxInstaller>(installer.get())); 67 content::Source<extensions::CrxInstaller>(installer.get()));
67 installer->set_allow_silent_install(true); 68 installer->set_allow_silent_install(true);
68 installer->set_creation_flags(extensions::Extension::FROM_WEBSTORE); 69 installer->set_creation_flags(extensions::Extension::FROM_WEBSTORE);
69 installer->InstallCrx(path); 70 installer->InstallCrx(path);
70 // Wait for CRX to be installed. 71 // Wait for CRX to be installed.
71 observer.Wait(); 72 observer.Wait();
72 std::string extensionId = installer->extension()->id(); 73 std::string extensionId = installer->extension()->id();
73 if (!service->GetExtensionById(extensionId, false)) 74 if (!service->GetExtensionById(extensionId, false))
74 return ""; 75 return "";
75 return extensionId; 76 return extensionId;
(...skipping 30 matching lines...) Expand all
106 } 107 }
107 108
108 // Disabled for leaking memory: http://crbug.com/380537 109 // Disabled for leaking memory: http://crbug.com/380537
109 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, 110 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest,
110 DISABLED_CompactKeysetTransitionTest) { 111 DISABLED_CompactKeysetTransitionTest) {
111 std::string id = InstallIMEExtension(); 112 std::string id = InstallIMEExtension();
112 ASSERT_FALSE(id.empty()); 113 ASSERT_FALSE(id.empty());
113 RunTest(base::FilePath("keyset_transition_test.js"), 114 RunTest(base::FilePath("keyset_transition_test.js"),
114 InputViewConfig(id, kCompactLayout)); 115 InputViewConfig(id, kCompactLayout));
115 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698