Move NetworkStateNotifier and NetworkConnect from src/ui

chrome/browser/chromeos/status/data_promo_notification_unittest.cc

Index: chrome/browser/chromeos/status/data_promo_notification_unittest.cc
diff --git a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
index 18be7f1bfeaf143705808da4cfef9b7b923c1ed3..347009011a160417f8e4d934375a7984cb9b35bc 100644
--- a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
@@ -16,11 +16,11 @@
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/login/login_state.h"
+#include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_state_handler.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/platform_test.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/chromeos/network/network_connect.h"
 #include "ui/message_center/message_center.h"
 
 namespace {
@@ -30,7 +30,7 @@ const char kCellularServicePath[] = "/service/cellular1";
 const char kNotificationId[] = "chrome://settings/internet/data_saver";
 const char kTestUserName[] = "test-user@example.com";
 
-class NetworkConnectTestDelegate : public ui::NetworkConnect::Delegate {
+class NetworkConnectTestDelegate : public chromeos::NetworkConnect::Delegate {
  public:
   NetworkConnectTestDelegate() {}
   ~NetworkConnectTestDelegate() override {}
@@ -42,6 +42,9 @@ class NetworkConnectTestDelegate : public ui::NetworkConnect::Delegate {
   }
   void ShowMobileSimDialog() override {}
   void ShowMobileSetupDialog(const std::string& network_id) override {}
+  void ShowNetworkConnectError(const std::string& error_name,
+                               const std::string& network_id) override {}
+  void ShowMobileActivationError(const std::string& network_id) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectTestDelegate);
@@ -69,11 +72,11 @@ class DataPromoNotificationTest : public testing::Test {
     message_center::MessageCenter::Initialize();
     base::RunLoop().RunUntilIdle();
     network_connect_delegate_.reset(new NetworkConnectTestDelegate);
-    ui::NetworkConnect::Initialize(network_connect_delegate_.get());
+    chromeos::NetworkConnect::Initialize(network_connect_delegate_.get());
   }
 
   void TearDown() override {
-    ui::NetworkConnect::Shutdown();
+    chromeos::NetworkConnect::Shutdown();
     network_connect_delegate_.reset();
     message_center::MessageCenter::Shutdown();
     LoginState::Shutdown();
@@ -153,7 +156,7 @@ TEST_F(DataPromoNotificationTest, DataSaverNotification) {
   // Network setup shouldn't be enough to activate notification.
   EXPECT_FALSE(message_center->FindVisibleNotificationById(kNotificationId));
 
-  ui::NetworkConnect::Get()->ConnectToNetwork(kCellularServicePath);
+  chromeos::NetworkConnect::Get()->ConnectToNetwork(kCellularServicePath);
   base::RunLoop().RunUntilIdle();
   // Connecting to cellular network (which here makes it the default network)
   // should trigger the Data Saver notification.