Index: chrome/browser/power/process_power_collector_unittest.cc |
diff --git a/chrome/browser/power/process_power_collector_unittest.cc b/chrome/browser/power/process_power_collector_unittest.cc |
index 352f26db253a14e347b780e147222e30f325b7be..82c7760108e9df20725d5902907afbba4318d63d 100644 |
--- a/chrome/browser/power/process_power_collector_unittest.cc |
+++ b/chrome/browser/power/process_power_collector_unittest.cc |
@@ -82,7 +82,7 @@ class BrowserProcessPowerTest : public BrowserWithTestWindowTest { |
process_id) |
#endif |
); |
- return proc_handle.Pass(); |
+ return proc_handle; |
} |
scoped_ptr<ProcessPowerCollector> collector; |
@@ -103,7 +103,7 @@ TEST_F(BrowserProcessPowerTest, OneSite) { |
EXPECT_EQ(1u, metrics_map->size()); |
// Create fake process numbers. |
- GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1).Pass()); |
+ GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1)); |
OriginPowerMap* origin_power_map = |
OriginPowerMapFactory::GetForBrowserContext(profile()); |
@@ -132,9 +132,9 @@ TEST_F(BrowserProcessPowerTest, MultipleSites) { |
AddTab(browser3.get(), url3); |
// Create fake process numbers. |
- GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1).Pass()); |
- GetProcess(browser2.get())->SetProcessHandle(MakeProcessHandle(2).Pass()); |
- GetProcess(browser3.get())->SetProcessHandle(MakeProcessHandle(3).Pass()); |
+ GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1)); |
+ GetProcess(browser2.get())->SetProcessHandle(MakeProcessHandle(2)); |
+ GetProcess(browser3.get())->SetProcessHandle(MakeProcessHandle(3)); |
collector->UpdatePowerConsumptionForTesting(); |
ProcessPowerCollector::ProcessMetricsMap* metrics_map = |
@@ -178,9 +178,8 @@ TEST_F(BrowserProcessPowerTest, IncognitoDoesntRecordPowerUsage) { |
AddTab(incognito_browser.get(), hidden_url); |
// Create fake process numbers. |
- GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1).Pass()); |
- GetProcess(incognito_browser.get()) |
- ->SetProcessHandle(MakeProcessHandle(2).Pass()); |
+ GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1)); |
+ GetProcess(incognito_browser.get())->SetProcessHandle(MakeProcessHandle(2)); |
EXPECT_DOUBLE_EQ(0, collector->UpdatePowerConsumptionForTesting()); |
ProcessPowerCollector::ProcessMetricsMap* metrics_map = |
@@ -218,8 +217,8 @@ TEST_F(BrowserProcessPowerTest, MultipleProfilesRecordSeparately) { |
AddTab(other_user.get(), hidden_url); |
// Create fake process numbers. |
- GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1).Pass()); |
- GetProcess(other_user.get())->SetProcessHandle(MakeProcessHandle(2).Pass()); |
+ GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1)); |
+ GetProcess(other_user.get())->SetProcessHandle(MakeProcessHandle(2)); |
EXPECT_DOUBLE_EQ(0, collector->UpdatePowerConsumptionForTesting()); |
EXPECT_EQ(2u, collector->metrics_map_for_testing()->size()); |