DevTools: merge devtools target with devtools host, part 1

content/browser/devtools/protocol/service_worker_handler.cc

 // Copyright 2015 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 "content/browser/devtools/protocol/service_worker_handler.h"
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 226 matching lines @@
 }
 
 Response CreateContextErrorResponse() {
   return Response::InternalError("Could not connect to the context");
 }
 
 Response CreateInvalidVersionIdErrorResponse() {
   return Response::InternalError("Invalid version ID");
 }
 
-const std::string GetDevToolsAgentHostTypeString(
-    content::DevToolsAgentHost::Type type) {
-  switch (type) {
-    case DevToolsAgentHost::TYPE_WEB_CONTENTS:
-      return "web_contents";
-    case DevToolsAgentHost::TYPE_FRAME:
-      return "frame";
-    case DevToolsAgentHost::TYPE_SHARED_WORKER:
-      return "shared_worker";
-    case DevToolsAgentHost::TYPE_SERVICE_WORKER:
-      return "service_worker";
-    case DevToolsAgentHost::TYPE_EXTERNAL:
-      return "external";
-    case DevToolsAgentHost::TYPE_BROWSER:
-      return "browser";
-  }
-  NOTREACHED() << type;
-  return std::string();
-}
-
 void DidFindRegistrationForDispatchSyncEventOnIO(
     scoped_refptr<BackgroundSyncContext> sync_context,
     const std::string& tag,
     bool last_chance,
     ServiceWorkerStatusCode status,
     scoped_refptr<content::ServiceWorkerRegistration> registration) {
   if (status != SERVICE_WORKER_OK || !registration->active_version())
     return;
   BackgroundSyncManager* background_sync_manager =
       sync_context->background_sync_manager();
@@ skipping 262 matching lines @@
 Response ServiceWorkerHandler::GetTargetInfo(
     const std::string& target_id,
     scoped_refptr<TargetInfo>* target_info) {
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetForId(target_id));
   if (!agent_host)
     return Response::InvalidParams("targetId");
   *target_info =
       TargetInfo::Create()
           ->set_id(agent_host->GetId())
-          ->set_type(GetDevToolsAgentHostTypeString(agent_host->GetType()))
+          ->set_type(agent_host->GetType())
           ->set_title(agent_host->GetTitle())
           ->set_url(agent_host->GetURL().spec());
   return Response::OK();
 }
 
 Response ServiceWorkerHandler::ActivateTarget(const std::string& target_id) {
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetForId(target_id));
   if (!agent_host)
     return Response::InvalidParams("targetId");
   agent_host->Activate();
   return Response::OK();
 }
 
 void ServiceWorkerHandler::OpenNewDevToolsWindow(int process_id,
                                                  int devtools_agent_route_id) {
   scoped_refptr<DevToolsAgentHostImpl> agent_host(
       ServiceWorkerDevToolsManager::GetInstance()
           ->GetDevToolsAgentHostForWorker(process_id, devtools_agent_route_id));
   if (!agent_host.get())
     return;
-  agent_host->Inspect(render_frame_host_->GetProcess()->GetBrowserContext());
+  agent_host->Inspect();
 }
 
 void ServiceWorkerHandler::OnWorkerRegistrationUpdated(
     const std::vector<ServiceWorkerRegistrationInfo>& registrations) {
   std::vector<scoped_refptr<ServiceWorkerRegistration>> registration_values;
   for (const auto& registration : registrations) {
     registration_values.push_back(
         CreateRegistrationDictionaryValue(registration));
   }
   client_->WorkerRegistrationUpdated(
@@ skipping 110 matching lines @@
 }
 
 void ServiceWorkerHandler::ClearForceUpdate() {
   if (context_)
     context_->SetForceUpdateOnPageLoad(false);
 }
 
 }  // namespace service_worker
 }  // namespace devtools
 }  // namespace content