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

chrome/browser/devtools/devtools_target_impl.cc

 // Copyright 2013 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/devtools/devtools_target_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 258 matching lines @@
 }
 
 // static
 scoped_ptr<DevToolsTargetImpl> DevToolsTargetImpl::CreateForWebContents(
     content::WebContents* web_contents,
     bool is_tab) {
   return scoped_ptr<DevToolsTargetImpl>(
       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);
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DevToolsTargetImpl::List result;
   DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
   for (DevToolsAgentHost::List::iterator it = agents.begin();
        it != agents.end(); ++it) {
     if (WebContents* web_contents = (*it)->GetWebContents()) {
       bool is_tab =
           tab_web_contents.find(web_contents) != tab_web_contents.end();
       result.push_back(new WebContentsTarget(web_contents, is_tab));
     }
   }
   return result;
 }
 
 static void CreateWorkerTargets(
     const std::vector<WorkerService::WorkerInfo>& worker_info,
     DevToolsTargetImpl::Callback callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DevToolsTargetImpl::List result;
   for (size_t i = 0; i < worker_info.size(); ++i) {
     result.push_back(new WorkerTarget(worker_info[i]));
   }
   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,
       FROM_HERE,
       base::Bind(&CreateWorkerTargets,
                  WorkerService::GetInstance()->GetWorkers(),
                  callback));
 }
 
 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();
   for (DevToolsAgentHost::List::iterator it = agents.begin();
       it != agents.end(); ++it) {
     if ((*it)->GetType() == DevToolsAgentHost::TYPE_SERVICE_WORKER)
       result.push_back(new WorkerTarget(*it));
   }
   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)));
 }