Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chromeos / network / policy_applicator.cc

diff --git a/src/chromeos/network/policy_applicator.cc b/src/chromeos/network/policy_applicator.cc
index 9bb61d5..088cd46 100644 (file)
--- a/src/chromeos/network/policy_applicator.cc
+++ b/src/chromeos/network/policy_applicator.cc
@@ -14,6 +14,7 @@
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_profile_client.h"
+#include "chromeos/network/network_type_pattern.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translator.h"
@@ -255,7 +256,7 @@ void PolicyApplicator::WriteNewShillConfiguration(
     std::string auth;
     ethernet->GetStringWithoutPathExpansion(::onc::ethernet::kAuthentication,
                                             &auth);
-    if (auth == ::onc::ethernet::kNone)
+    if (auth == ::onc::ethernet::kAuthenticationNone)
       return;
   }
 
@@ -301,7 +302,8 @@ PolicyApplicator::~PolicyApplicator() {
   STLDeleteValues(&all_policies_);
   // Notify the handler about all policies being applied, so that the network
   // lists can be updated.
-  handler_->OnPoliciesApplied();
+  if (handler_)
+    handler_->OnPoliciesApplied();
 }
 
 void PolicyApplicator::ApplyRemainingPolicies() {