mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fixing mac ut failure

Browse source
This commit is contained in:
HariJ 2017-04-27 11:09:27 -07:00 committed by Hari Krishna Reddy Juturu
parent 3d12440a4a
commit 81bd9fa3a2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_app.cc
View file

@ -34,6 +34,7 @@
#include "chrome/browser/icon_manager.h" #include "chrome/browser/icon_manager.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
#include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/browser_accessibility_state.h"
#include "content/public/browser/browser_child_process_host.h"
#include "content/public/browser/client_certificate_delegate.h" #include "content/public/browser/client_certificate_delegate.h"
#include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
@ -934,7 +935,8 @@ v8::Local<v8::Value> App::GetAppMemoryInfo(v8::Isolate* isolate) {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
std::unique_ptr<base::ProcessMetrics> metrics( std::unique_ptr<base::ProcessMetrics> metrics(
base::ProcessMetrics::CreateProcessMetrics(process.Handle(), nullptr)); base::ProcessMetrics::CreateProcessMetrics(
process.Handle(), content::BrowserChildProcessHost::GetPortProvider()));
#else #else
std::unique_ptr<base::ProcessMetrics> metrics( std::unique_ptr<base::ProcessMetrics> metrics(
base::ProcessMetrics::CreateProcessMetrics(process.Handle())); base::ProcessMetrics::CreateProcessMetrics(process.Handle()));

3
spec/api-app-spec.js
View file

@ -539,7 +539,8 @@ describe('app module', function () {
const appMemoryInfo = app.getAppMemoryInfo() const appMemoryInfo = app.getAppMemoryInfo()
assert.ok(appMemoryInfo.length > 0, 'App memory info object is not > 0') assert.ok(appMemoryInfo.length > 0, 'App memory info object is not > 0')
assert.ok(appMemoryInfo[0].memory.workingSetSize > 0, 'working set size is not > 0') assert.ok(appMemoryInfo[0].memory.workingSetSize > 0, 'working set size is not > 0')
assert.ok(appMemoryInfo[0].memory.peakWorkingSetSize > 0, 'peak working set size is not > 0') assert.ok(appMemoryInfo[0].memory.privateBytes > 0, 'private bytes is not > 0')
assert.ok(appMemoryInfo[0].memory.sharedBytes > 0, 'shared bytes is not > 0')
assert.ok(appMemoryInfo[0].pid > 0, 'pid is not > 0') assert.ok(appMemoryInfo[0].pid > 0, 'pid is not > 0')
}) })
}) })