Moves methods for finding browsers to browser_finder.

chrome/browser/extensions/app_process_apitest.cc

 // Copyright (c) 2012 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 "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/string_ordinal.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 121 matching lines @@
     // tab, we now have 3 tabs. The two app tabs should not be in the same
     // process, since they do not have the background permission.  (Thus, we
     // want to separate them to improve responsiveness.)
     ASSERT_EQ(3, browser()->tab_count());
     RenderViewHost* host1 = browser()->GetWebContentsAt(1)->GetRenderViewHost();
     RenderViewHost* host2 = browser()->GetWebContentsAt(2)->GetRenderViewHost();
     EXPECT_NE(host1->GetProcess(), host2->GetProcess());
 
     // Opening tabs with window.open should keep the page in the opener's
     // process.
-    ASSERT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));
+    ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
     WindowOpenHelper(browser(), host1,
                     base_url.Resolve("path1/empty.html"), true);
     LOG(INFO) << "WindowOpenHelper 1.";
     WindowOpenHelper(browser(), host2,
                     base_url.Resolve("path2/empty.html"), true);
     LOG(INFO) << "End of test.";
   }
 };
 
 // Tests that hosted apps with the background permission get a process-per-app
@@ skipping 51 matching lines @@
   // should be part of the extension app and grouped in the same process.
   ASSERT_EQ(4, browser()->tab_count());
   RenderViewHost* host = browser()->GetWebContentsAt(1)->GetRenderViewHost();
 
   EXPECT_EQ(host->GetProcess(),
             browser()->GetWebContentsAt(2)->GetRenderProcessHost());
   EXPECT_NE(host->GetProcess(),
             browser()->GetWebContentsAt(3)->GetRenderProcessHost());
 
   // Now let's do the same using window.open. The same should happen.
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));
+  ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
   WindowOpenHelper(browser(), host,
                    base_url.Resolve("path1/empty.html"), true);
   LOG(INFO) << "WindowOpenHelper 1.";
   WindowOpenHelper(browser(), host,
                    base_url.Resolve("path2/empty.html"), true);
   LOG(INFO) << "WindowOpenHelper 2.";
   // TODO(creis): This should open in a new process (i.e., false for the last
   // argument), but we temporarily avoid swapping processes away from an app
   // until we're able to support cross-process postMessage calls.
   // See crbug.com/59285.
@@ skipping 90 matching lines @@
 
   // We should have opened 2 new bookmark app tabs. Including the original blank
   // tab, we now have 3 tabs.  Because normal pages use the
   // process-per-site-instance model, each should be in its own process.
   ASSERT_EQ(3, browser()->tab_count());
   RenderViewHost* host = browser()->GetWebContentsAt(1)->GetRenderViewHost();
   EXPECT_NE(host->GetProcess(),
             browser()->GetWebContentsAt(2)->GetRenderProcessHost());
 
   // Now let's do the same using window.open. The same should happen.
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));
+  ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
   WindowOpenHelper(browser(), host,
                    base_url.Resolve("path1/empty.html"), true);
   WindowOpenHelper(browser(), host,
                    base_url.Resolve("path2/empty.html"), true);
 
   // Now let's have a tab navigate out of and back into the app's web
   // extent. Neither navigation should switch processes.
   const GURL& app_url(base_url.Resolve("path1/empty.html"));
   const GURL& non_app_url(base_url.Resolve("path3/empty.html"));
   RenderViewHost* host2 = browser()->GetWebContentsAt(2)->GetRenderViewHost();
@@ skipping 332 matching lines @@
           &browser()->GetSelectedTabContentsWrapper()->web_contents()->
               GetController()));
   browser()->Reload(CURRENT_TAB);
   observer.Wait();
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
 }