Move NetworkStateNotifier and NetworkConnect from src/ui

chrome/browser/chromeos/status/data_promo_notification_unittest.cc

 // Copyright (c) 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 "chrome/browser/chromeos/status/data_promo_notification.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #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 {
 
 const char kCellularDevicePath[] = "/device/stub_cellular_device1";
 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 {}
 
   void ShowNetworkConfigure(const std::string& network_id) override {}
   void ShowNetworkSettings(const std::string& network_id) override {}
   bool ShowEnrollNetwork(const std::string& network_id) override {
     return false;
   }
   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);
 };
 
 }  // namespace
 
 namespace chromeos {
 namespace test {
 
 class DataPromoNotificationTest : public testing::Test {
  public:
   DataPromoNotificationTest() {}
   ~DataPromoNotificationTest() override {}
 
   void SetUp() override {
     testing::Test::SetUp();
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableDataSaverPrompt);
     DBusThreadManager::Initialize();
     NetworkHandler::Initialize();
     data_promo_notification_.reset(new DataPromoNotification);
     SetupUser();
     SetupNetworkShillState();
     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();
     profile_manager_.reset();
     user_manager_enabler_.reset();
     data_promo_notification_.reset();
     NetworkHandler::Shutdown();
     DBusThreadManager::Shutdown();
     testing::Test::TearDown();
   }
@@ skipping 59 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DataPromoNotificationTest);
 };
 
 TEST_F(DataPromoNotificationTest, DataSaverNotification) {
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
 
   // 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.
   EXPECT_TRUE(message_center->FindVisibleNotificationById(kNotificationId));
 }
 
 }  // namespace test
 }  // namespace chromeos