projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
performance_monitor
/
performance_monitor_browsertest.cc
diff --git
a/src/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
b/src/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index
96629f9
..
81519c9
100644
(file)
--- a/
src/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/
src/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@
-40,12
+40,14
@@
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_navigation_observer.h"
#include "content/public/test/test_utils.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_navigation_observer.h"
#include "content/public/test/test_utils.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
#if defined(OS_CHROMEOS)
#include "extensions/common/extension.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chromeos/chromeos_switches.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chromeos/chromeos_switches.h"
+#include "components/user_manager/user_manager.h"
#endif
#if defined(OS_MACOSX)
#endif
#if defined(OS_MACOSX)
@@
-357,9
+359,8
@@
class PerformanceMonitorUncleanExitBrowserTest
virtual void AddSecondUserAccount() {
// Add second user account for multi-profile test.
if (GetParam()) {
virtual void AddSecondUserAccount() {
// Add second user account for multi-profile test.
if (GetParam()) {
- chromeos::UserManager::Get()->UserLoggedIn(kSecondProfileAccount,
- kSecondProfileHash,
- false);
+ user_manager::UserManager::Get()->UserLoggedIn(
+ kSecondProfileAccount, kSecondProfileHash, false);
}
}
#endif
}
}
#endif
@@
-499,21
+500,22
@@
IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, UpdateExtensionEvent) {
std::vector<ExtensionBasicInfo> extension_infos;
extension_infos.push_back(ExtensionBasicInfo(extension));
std::vector<ExtensionBasicInfo> extension_infos;
extension_infos.push_back(ExtensionBasicInfo(extension));
- ExtensionService* extension_service =
- browser()->profile()
->GetExtensionS
ervice();
+ ExtensionService* extension_service =
extensions::ExtensionSystem::Get(
+ browser()->profile()
)->extension_s
ervice();
extensions::CrxInstaller* crx_installer = NULL;
// Create an observer to wait for the update to finish.
content::WindowedNotificationObserver windowed_observer(
extensions::CrxInstaller* crx_installer = NULL;
// Create an observer to wait for the update to finish.
content::WindowedNotificationObserver windowed_observer(
-
chrome
::NOTIFICATION_CRX_INSTALLER_DONE,
+
extensions
::NOTIFICATION_CRX_INSTALLER_DONE,
content::Source<extensions::CrxInstaller>(crx_installer));
content::Source<extensions::CrxInstaller>(crx_installer));
- ASSERT_TRUE(extension_service->
-
UpdateExtension(
extension->id(), path_v2_, true, &crx_installer));
+ ASSERT_TRUE(extension_service->
UpdateExtension(
+ extension->id(), path_v2_, true, &crx_installer));
windowed_observer.Wait();
windowed_observer.Wait();
- extension = extension_service->GetExtensionById(
- extension_infos[0].id, false); // don't include disabled extensions.
+ extension = extensions::ExtensionRegistry::Get(
+ browser()->profile())->enabled_extensions().GetByID(
+ extension_infos[0].id);
// The total series of events for this process will be:
// Extension Install - install version 1
// The total series of events for this process will be:
// Extension Install - install version 1