Revert of DevTools: merge devtools target with devtools host, part 1

chrome/browser/extensions/api/debugger/debugger_api.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.
 
 // Implements the Chrome Extensions Debugger API.
 
 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/scoped_observer.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/devtools/global_confirm_info_bar.h"
 #include "chrome/browser/extensions/api/debugger/debugger_api_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 627 matching lines @@
 // DebuggerGetTargetsFunction -------------------------------------------------
 
 namespace {
 
 const char kTargetIdField[] = "id";
 const char kTargetTypeField[] = "type";
 const char kTargetTitleField[] = "title";
 const char kTargetAttachedField[] = "attached";
 const char kTargetUrlField[] = "url";
 const char kTargetFaviconUrlField[] = "faviconUrl";
+const char kTargetTypePage[] = "page";
+const char kTargetTypeBackgroundPage[] = "background_page";
+const char kTargetTypeWorker[] = "worker";
+const char kTargetTypeOther[] = "other";
 const char kTargetTabIdField[] = "tabId";
 const char kTargetExtensionIdField[] = "extensionId";
-const char kTargetTypeWorker[] = "worker";
 
 base::Value* SerializeTarget(const DevToolsTargetImpl& target) {
   base::DictionaryValue* dictionary = new base::DictionaryValue();
-  scoped_refptr<DevToolsAgentHost> host = target.GetAgentHost();
-  dictionary->SetString(kTargetIdField, host->GetId());
-  dictionary->SetString(kTargetTitleField, host->GetTitle());
-  dictionary->SetBoolean(kTargetAttachedField, host->IsAttached());
-  dictionary->SetString(kTargetUrlField, host->GetURL().spec());
 
-  std::string type = host->GetType();
-  if (type == DevToolsAgentHost::kTypePage) {
-    int tab_id =
-        extensions::ExtensionTabUtil::GetTabId(host->GetWebContents());
-    dictionary->SetInteger(kTargetTabIdField, tab_id);
-  } else if (type == ChromeDevToolsManagerDelegate::kTypeBackgroundPage) {
-    dictionary->SetString(kTargetExtensionIdField, host->GetURL().host());
+  dictionary->SetString(kTargetIdField, target.GetId());
+  dictionary->SetString(kTargetTitleField, target.GetTitle());
+  dictionary->SetBoolean(kTargetAttachedField, target.IsAttached());
+  dictionary->SetString(kTargetUrlField, target.GetURL().spec());
+
+  std::string type = target.GetType();
+  if (type == kTargetTypePage) {
+    dictionary->SetInteger(kTargetTabIdField, target.GetTabId());
+  } else if (type == kTargetTypeBackgroundPage) {
+    dictionary->SetString(kTargetExtensionIdField, target.GetExtensionId());
+  } else if (type != kTargetTypeWorker) {
+    // DevToolsTargetImpl may support more types than the debugger API.
+    type = kTargetTypeOther;
   }
-
-  if (type == DevToolsAgentHost::kTypeServiceWorker ||
-      type == DevToolsAgentHost::kTypeSharedWorker) {
-    type = kTargetTypeWorker;
-  }
-
   dictionary->SetString(kTargetTypeField, type);
 
-  GURL favicon_url = host->GetFaviconURL();
+  GURL favicon_url = target.GetFaviconURL();
   if (favicon_url.is_valid())
     dictionary->SetString(kTargetFaviconUrlField, favicon_url.spec());
 
   return dictionary;
 }
 
 }  // namespace
 
 DebuggerGetTargetsFunction::DebuggerGetTargetsFunction() {
 }
@@ skipping 14 matching lines @@
     const std::vector<DevToolsTargetImpl*>& target_list) {
   std::unique_ptr<base::ListValue> result(new base::ListValue());
   for (size_t i = 0; i < target_list.size(); ++i)
     result->Append(SerializeTarget(*target_list[i]));
   base::STLDeleteContainerPointers(target_list.begin(), target_list.end());
   SetResult(std::move(result));
   SendResponse(true);
 }
 
 }  // namespace extensions