arc: Update device owner check implementation

components/arc/net/arc_net_host_impl.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/arc/net/arc_net_host_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "components/arc/arc_bridge_service.h"
@@ skipping 11 matching lines @@
       ->managed_network_configuration_handler();
 }
 
 chromeos::NetworkConnectionHandler* GetNetworkConnectionHandler() {
   return chromeos::NetworkHandler::Get()->network_connection_handler();
 }
 
 bool IsDeviceOwner() {
   // Check whether the logged-in Chrome OS user is allowed to add or
   // remove WiFi networks.
-  return chromeos::LoginState::Get()->GetLoggedInUserType() ==
-         chromeos::LoginState::LOGGED_IN_USER_OWNER;
+  return chromeos::ChromeUserManager::Get()->GetOwnerAccountId() ==
+         chromeos::ChromeUserManager::Get()->GetActiveUser()->GetAccountId();

[xiyuan, 2017/03/16 05:13:21]

I don't think this helps. GetOwnerAccountId() also changes based on ownership
check, in the same as the logged-in user type, See [1] and [2]. We should get
the same racy behavior.

There is an OwnerSettingsService::IsOwnerAsync that we can use. The ownership
check takes a few seconds after login (after loading the owner private key).
Unfortunately, there is no synchronous way to check this. 

[1]
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/login/users/chro...
[2]
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/login/users/chro...

[xiyuan, 2017/03/16 17:14:51]

Per discussion with abhishekbh@, the LoginState code is a 100% failure. The
owner state of that code seems broken. He will filed a bug and I will take a
look.

Meanwhile, I am okay switching to use GetOwnerAccountId().

 }
 
 std::string GetStringFromOncDictionary(const base::DictionaryValue* dict,
                                        const char* key,
                                        bool required) {
   std::string value;
   dict->GetString(key, &value);
   if (required && value.empty())
     VLOG(1) << "Required parameter " << key << " was not found.";
   return value;
@@ skipping 594 matching lines @@
   net_instance->WifiEnabledStateChanged(is_enabled);
 }
 
 void ArcNetHostImpl::OnShuttingDown() {
   DCHECK(observing_network_state_);
   GetStateHandler()->RemoveObserver(this, FROM_HERE);
   observing_network_state_ = false;
 }
 
 }  // namespace arc