Separating ONC<->Shill translation from the ONC signature.

chrome/browser/chromeos/extensions/networking_private_event_router.cc

 // Copyright (c) 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/chromeos/extensions/networking_private_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/extensions/networking_private_api.h"
 #include "chrome/browser/extensions/event_names.h"
@@ skipping 11 matching lines @@
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using extensions::event_names::kOnNetworkListChanged;
 using extensions::event_names::kOnNetworksChanged;
 using extensions::EventRouter;
 using extensions::ExtensionSystem;
 namespace api = extensions::api::networking_private;
 
 namespace chromeos {
 
-namespace {
-
-// Translates the current connection state of the network into the ONC
-// equivalent.
-std::string GetConnectionState(const NetworkState* state) {
-  if (state->IsConnectedState())
-    return onc::connection_state::kConnected;
-  else if (state->IsConnectingState())
-    return onc::connection_state::kConnecting;
-  else
-    return onc::connection_state::kNotConnected;
-}
-
-// Translate from the Shill network type to the ONC network type.
-std::string GetConnectionType(const std::string& shill_type) {
-  base::DictionaryValue shill_type_dict;
-  shill_type_dict.SetStringWithoutPathExpansion(flimflam::kTypeProperty,
-                                                shill_type);
-  scoped_ptr<base::DictionaryValue> onc_type_dict =
-      onc::TranslateShillServiceToONCPart(
-          shill_type_dict,
-          &onc::kNetworkConfigurationSignature);
-  std::string onc_type;
-  if (onc_type_dict->GetString(onc::network_config::kType, &onc_type))
-    return onc_type;
-  return std::string();
-}
-
-}  // namespace
-
 NetworkingPrivateEventRouter::NetworkingPrivateEventRouter(Profile* profile)
     : profile_(profile), listening_(false) {
   // Register with the event router so we know when renderers are listening to
   // our events. We first check and see if there *is* an event router, because
   // some unit tests try to create all profile services, but don't initialize
   // the event router first.
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
   if (event_router) {
     event_router->RegisterObserver(
         this, extensions::event_names::kOnNetworksChanged);
@@ skipping 76 matching lines @@
     return;
 
   scoped_ptr<base::ListValue> args(api::OnNetworksChanged::Create(
       std::vector<std::string>(1, network->path())));
   scoped_ptr<extensions::Event> extension_event(
       new extensions::Event(kOnNetworksChanged, args.Pass()));
   event_router->BroadcastEvent(extension_event.Pass());
 }
 
 }  // namespace chromeos