[DevTools] Unify workers and web contents handling in inspect_ui.

chrome/browser/devtools/devtools_target_impl.cc

Index: chrome/browser/devtools/devtools_target_impl.cc
diff --git a/chrome/browser/devtools/devtools_target_impl.cc b/chrome/browser/devtools/devtools_target_impl.cc
index 03947822b9eaa6361dcc23f5ffaa3f4404f095af..aa51465f228463cfbb9125bd90e8bc013f0423ba 100644
--- a/chrome/browser/devtools/devtools_target_impl.cc
+++ b/chrome/browser/devtools/devtools_target_impl.cc
@@ -276,8 +276,9 @@ scoped_ptr<DevToolsTargetImpl> DevToolsTargetImpl::CreateForWebContents(
       new WebContentsTarget(web_contents, is_tab));
 }
 
-// static
-DevToolsTargetImpl::List DevToolsTargetImpl::EnumerateWebContentsTargets() {
+namespace {
+
+static DevToolsTargetImpl::List EnumerateWebContentsTargets() {

[pfeldman, 2014/09/11 17:53:05]

- It is either namespace or static.
- anonymous namespace is already declared above.

[dgozman, 2014/09/12 10:54:29]

Done.

   std::set<WebContents*> tab_web_contents;
   for (TabContentsIterator it; !it.done(); it.Next())
     tab_web_contents.insert(*it);
@@ -307,8 +308,7 @@ static void CreateWorkerTargets(
   callback.Run(result);
 }
 
-// static
-void DevToolsTargetImpl::EnumerateWorkerTargets(Callback callback) {
+static void EnumerateWorkerTargets(DevToolsTargetImpl::Callback callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
@@ -322,8 +322,7 @@ static void CollectAllTargets(
     DevToolsTargetImpl::Callback callback,
     const DevToolsTargetImpl::List& worker_targets) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DevToolsTargetImpl::List result =
-      DevToolsTargetImpl::EnumerateWebContentsTargets();
+  DevToolsTargetImpl::List result = EnumerateWebContentsTargets();
   result.insert(result.end(), worker_targets.begin(), worker_targets.end());
 
   DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
@@ -335,12 +334,14 @@ static void CollectAllTargets(
   callback.Run(result);
 }
 
+}  // namespace
+
 // static
 void DevToolsTargetImpl::EnumerateAllTargets(Callback callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
-      base::Bind(&DevToolsTargetImpl::EnumerateWorkerTargets,
+      base::Bind(&EnumerateWorkerTargets,
                  base::Bind(&CollectAllTargets, callback)));
 }