Fix the browser match rules.

chrome/browser/power/process_power_collector_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/power/process_power_collector.h"
 
 #include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 105 matching lines @@
   EXPECT_DOUBLE_EQ(5, collector->UpdatePowerConsumptionForTesting());
   EXPECT_EQ(100, origin_power_map->GetPowerForOrigin(url));
 }
 
 TEST_F(BrowserProcessPowerTest, MultipleSites) {
   Browser::CreateParams native_params(profile(),
                                       chrome::HOST_DESKTOP_TYPE_NATIVE);
   GURL url1("http://www.google.com");
   GURL url2("http://www.example.com");
   GURL url3("https://www.google.com");
-  scoped_ptr<Browser> browser2(
-      chrome::CreateBrowserWithTestWindowForParams(&native_params));
-  scoped_ptr<Browser> browser3(
-      chrome::CreateBrowserWithTestWindowForParams(&native_params));
+  scoped_ptr<Browser> browser2 =

[msw, 2015/07/09 22:37:37]

nit: All these callsites in the CL can still use the copy ctor...

[xdai1, 2015/07/09 23:45:40]

Reverted it back....

+      chrome::CreateBrowserWithTestWindowForParams(&native_params);
+  scoped_ptr<Browser> browser3 =
+      chrome::CreateBrowserWithTestWindowForParams(&native_params);
   AddTab(browser(), url1);
   AddTab(browser2.get(), url2);
   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());
 
   collector->UpdatePowerConsumptionForTesting();
@@ skipping 22 matching lines @@
   chrome::CloseTab(browser2.get());
   chrome::CloseTab(browser3.get());
 
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(1u, metrics_map->size());
 }
 
 TEST_F(BrowserProcessPowerTest, IncognitoDoesntRecordPowerUsage) {
   Browser::CreateParams native_params(profile()->GetOffTheRecordProfile(),
                                       chrome::HOST_DESKTOP_TYPE_NATIVE);
-  scoped_ptr<Browser> incognito_browser(
-      chrome::CreateBrowserWithTestWindowForParams(&native_params));
+  scoped_ptr<Browser> incognito_browser =
+      chrome::CreateBrowserWithTestWindowForParams(&native_params);
   GURL url("http://www.google.com");
   AddTab(browser(), url);
 
   GURL hidden_url("http://foo.com");
   AddTab(incognito_browser.get(), hidden_url);
 
   // Create fake process numbers.
   GetProcess(browser())->SetProcessHandle(MakeProcessHandle(1).Pass());
   GetProcess(incognito_browser.get())
       ->SetProcessHandle(MakeProcessHandle(2).Pass());
@@ skipping 104 matching lines @@
       base::Bind(&BrowserProcessPowerTest::ReturnCpuAsConstant,
                  base::Unretained(this),
                  5));
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(1u, collector->metrics_map_for_testing()->size());
 
   window->OnNativeClose();
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(0u, collector->metrics_map_for_testing()->size());
 }