Move NetworkTypePattern to its own file

chromeos/dbus/fake_shill_device_client.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 "chromeos/dbus/fake_shill_device_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
-#include "chromeos/network/shill_property_util.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 221 matching lines @@
   properties->SetWithoutPathExpansion(shill::kTypeProperty,
                                       base::Value::CreateStringValue(type));
   properties->SetWithoutPathExpansion(
       shill::kNameProperty,
       base::Value::CreateStringValue(object_path));
   properties->SetWithoutPathExpansion(
       shill::kDBusObjectProperty, base::Value::CreateStringValue(object_path));
   properties->SetWithoutPathExpansion(
       shill::kDBusServiceProperty,
       base::Value::CreateStringValue(modemmanager::kModemManager1ServiceName));
-  if (NetworkTypePattern::Cellular().MatchesType(type)) {
+  if (type == shill::kTypeCellular) {

[stevenjb, 2014/05/27 22:37:43]

I don't think Shill client code should use NetworkTypePatern, that's a
NetworkState concept.

     properties->SetWithoutPathExpansion(shill::kCellularAllowRoamingProperty,
                                         new base::FundamentalValue(false));
   }
 }
 
 void FakeShillDeviceClient::RemoveDevice(const std::string& device_path) {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       RemoveDevice(device_path);
 
   stub_devices_.RemoveWithoutPathExpansion(device_path, NULL);
@@ skipping 90 matching lines @@
   std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
       observer_list_.find(device_path);
   if (iter != observer_list_.end())
     return *(iter->second);
   PropertyObserverList* observer_list = new PropertyObserverList();
   observer_list_[device_path] = observer_list;
   return *observer_list;
 }
 
 }  // namespace chromeos