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

components/devtools_discovery/devtools_discovery_manager.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 "components/devtools_discovery/devtools_discovery_manager.h"
 
 #include "base/stl_util.h"
 #include "components/devtools_discovery/basic_target_descriptor.h"
 #include "content/public/browser/devtools_agent_host.h"
 
@@ skipping 64 matching lines @@
       command_dict->GetDictionary("params", &params_dict) &&
       params_dict->GetString("url", &url)) {
     std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor> descriptor =
         CreateNew(GURL(url));
     if (!descriptor)
       return nullptr;
     std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
     result->SetInteger("id", id);
     std::unique_ptr<base::DictionaryValue> cmd_result(
         new base::DictionaryValue());
-    cmd_result->SetString("targetId", descriptor->GetAgentHost()->GetId());
+    cmd_result->SetString("targetId", descriptor->GetId());
     result->Set("result", std::move(cmd_result));
     return result;
   }
   return nullptr;
 }
 
 }  // namespace devtools_discovery