Remove NetworkLibrary references from unit_tests and browser_tests
Also removes some files that are no longer referenced and some
includes from files that do not actually use NetworkLibrary.
BUG=273102
For activity_database_unittest.cc, in_process_browser_test.h:
[email protected]
Review URL: https://codereview.chromium.org/23183004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218145 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
index 8c44adc..ca714450 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
@@ -20,6 +19,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/chromeos_switches.h"
#include "content/public/browser/notification_service.h"
@@ -151,7 +151,7 @@
} // anonymouse namespace
-class AccessibilityManagerTest : public CrosInProcessBrowserTest {
+class AccessibilityManagerTest : public InProcessBrowserTest {
protected:
AccessibilityManagerTest() {}
virtual ~AccessibilityManagerTest() {}
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
index d26100f..d207565 100644
--- a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
@@ -12,7 +12,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
@@ -21,6 +20,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/chromeos_switches.h"
#include "components/user_prefs/user_prefs.h"
@@ -107,7 +107,7 @@
} // namespace
-class MagnificationManagerTest : public CrosInProcessBrowserTest,
+class MagnificationManagerTest : public InProcessBrowserTest,
public content::NotificationObserver {
protected:
MagnificationManagerTest() : observed_(false),
diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
deleted file mode 100644
index e83174f..0000000
--- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) 2011 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/cros/cros_in_process_browser_test.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace chromeos {
-
-using ::testing::AnyNumber;
-using ::testing::AtMost;
-using ::testing::InSequence;
-using ::testing::InvokeWithoutArgs;
-using ::testing::Return;
-using ::testing::ReturnRef;
-using ::testing::StrictMock;
-using ::testing::_;
-
-CrosInProcessBrowserTest::CrosInProcessBrowserTest() :
- mock_network_library_(NULL) {
-}
-
-CrosInProcessBrowserTest::~CrosInProcessBrowserTest() {
-}
-
-void CrosInProcessBrowserTest::InitStatusAreaMocks() {
- if (mock_network_library_)
- return;
- mock_network_library_ = new StrictMock<MockNetworkLibrary>();
- NetworkLibrary::SetForTesting(mock_network_library_);
-}
-
-void CrosInProcessBrowserTest::SetStatusAreaMocksExpectations() {
- // We don't care how often these are called, just set their return values:
- EXPECT_CALL(*mock_network_library_, AddNetworkProfileObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, AddNetworkManagerObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, AddNetworkDeviceObserver(_, _))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, RemoveNetworkProfileObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, RemoveNetworkManagerObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, RemoveNetworkDeviceObserver(_, _))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, RemoveObserverForAllNetworks(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_network_library_, FindCellularDevice())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const NetworkDevice*)(NULL))));
- EXPECT_CALL(*mock_network_library_, FindEthernetDevice())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const NetworkDevice*)(NULL))));
- EXPECT_CALL(*mock_network_library_, ethernet_available())
- .Times(AnyNumber())
- .WillRepeatedly((Return(true)));
- EXPECT_CALL(*mock_network_library_, wifi_available())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, wimax_available())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, cellular_available())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, ethernet_enabled())
- .Times(AnyNumber())
- .WillRepeatedly((Return(true)));
- EXPECT_CALL(*mock_network_library_, wifi_enabled())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, wimax_enabled())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, cellular_enabled())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, active_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const Network*)(NULL))));
- EXPECT_CALL(*mock_network_library_, active_nonvirtual_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const Network*)(NULL))));
- EXPECT_CALL(*mock_network_library_, ethernet_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const EthernetNetwork*)(NULL))));
- EXPECT_CALL(*mock_network_library_, wifi_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const WifiNetwork*)(NULL))));
- EXPECT_CALL(*mock_network_library_, wimax_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const WimaxNetwork*)(NULL))));
- EXPECT_CALL(*mock_network_library_, cellular_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const CellularNetwork*)(NULL))));
- EXPECT_CALL(*mock_network_library_, virtual_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const VirtualNetwork*)(NULL))));
- EXPECT_CALL(*mock_network_library_, wifi_networks())
- .Times(AnyNumber())
- .WillRepeatedly((ReturnRef(wifi_networks_)));
- EXPECT_CALL(*mock_network_library_, wimax_networks())
- .Times(AnyNumber())
- .WillRepeatedly((ReturnRef(wimax_networks_)));
- EXPECT_CALL(*mock_network_library_, cellular_networks())
- .Times(AnyNumber())
- .WillRepeatedly((ReturnRef(cellular_networks_)));
- EXPECT_CALL(*mock_network_library_, virtual_networks())
- .Times(AnyNumber())
- .WillRepeatedly((ReturnRef(virtual_networks_)));
- EXPECT_CALL(*mock_network_library_, connected_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const Network*)(NULL))));
- EXPECT_CALL(*mock_network_library_, connecting_network())
- .Times(AnyNumber())
- .WillRepeatedly((Return((const Network*)(NULL))));
- EXPECT_CALL(*mock_network_library_, virtual_network_connected())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, wifi_scanning())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, cellular_initializing())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)));
- EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
- .Times(AnyNumber());
-
- // Set specific expectations for interesting functions:
-
- // NetworkMenuButton::OnNetworkChanged() calls:
- EXPECT_CALL(*mock_network_library_, Connected())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)))
- .RetiresOnSaturation();
- EXPECT_CALL(*mock_network_library_, Connecting())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)))
- .RetiresOnSaturation();
- EXPECT_CALL(*mock_network_library_, cellular_connected())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)))
- .RetiresOnSaturation();
-
- // NetworkMenu::InitMenuItems() calls:
- EXPECT_CALL(*mock_network_library_, ethernet_connected())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)))
- .RetiresOnSaturation();
- EXPECT_CALL(*mock_network_library_, ethernet_connecting())
- .Times(AnyNumber())
- .WillRepeatedly((Return(false)))
- .RetiresOnSaturation();
-}
-
-void CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture() {
- InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
-
- InitStatusAreaMocks();
- SetStatusAreaMocksExpectations();
-}
-
-void CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture() {
- // Prevent bogus gMock leak check from firing.
- NetworkLibrary::Shutdown();
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.h b/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
deleted file mode 100644
index f75a9731..0000000
--- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_CROS_IN_PROCESS_BROWSER_TEST_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_CROS_IN_PROCESS_BROWSER_TEST_H_
-
-#include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/test/base/in_process_browser_test.h"
-
-namespace chromeos {
-
-class MockNetworkLibrary;
-
-// Base class for Chromium OS tests wanting to bring up a browser in the
-// browser test process and provide MockNetworkLibrary with preset behaviors.
-class CrosInProcessBrowserTest : public InProcessBrowserTest {
- public:
- CrosInProcessBrowserTest();
- virtual ~CrosInProcessBrowserTest();
-
- // InProcessBrowserTest overrides:
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
- virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
-
- private:
- // Sets up basic mocks that are used by status area items.
- void InitStatusAreaMocks();
-
- // Sets up corresponding expectations for basic mocks that
- // are used by status area items.
- // Make sure that InitStatusAreaMocks was called before.
- // They are all configured with RetiresOnSaturation().
- // Once such expectation is used it won't block expectations you've defined.
- void SetStatusAreaMocksExpectations();
-
- // Destroyed by NetworkLibrary::Shutdown().
- MockNetworkLibrary* mock_network_library_;
-
- // Stuff used for mock_network_library_.
- WifiNetworkVector wifi_networks_;
- WimaxNetworkVector wimax_networks_;
- CellularNetworkVector cellular_networks_;
- VirtualNetworkVector virtual_networks_;
- std::string empty_string_;
-
- DISALLOW_COPY_AND_ASSIGN(CrosInProcessBrowserTest);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_CROS_CROS_IN_PROCESS_BROWSER_TEST_H_
diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc
index 29cff16..04f65bd 100644
--- a/chrome/browser/chromeos/enrollment_dialog_view.cc
+++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_navigator.h"
diff --git a/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc b/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
index 98155da9..5e96053d 100644
--- a/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
+++ b/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
@@ -6,9 +6,9 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
#include "chrome/browser/chromeos/login/login_display_host_impl.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chromeos/chromeos_switches.h"
namespace chromeos {
@@ -38,7 +38,7 @@
} // namespace
-class CaptivePortalWindowTest : public CrosInProcessBrowserTest {
+class CaptivePortalWindowTest : public InProcessBrowserTest {
protected:
void ShowIfRedirected() {
captive_portal_window_proxy_->ShowIfRedirected();
diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
index 60002af..6062fd8 100644
--- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc
+++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
@@ -8,10 +8,10 @@
#include "base/command_line.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/fake_session_manager_client.h"
@@ -31,7 +31,7 @@
} // namespace
-class CrashRestoreSimpleTest : public CrosInProcessBrowserTest {
+class CrashRestoreSimpleTest : public InProcessBrowserTest {
protected:
CrashRestoreSimpleTest() {}
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index d9a2914..0d5d012 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -184,7 +184,7 @@
// deletes its OnlineAttemptHost instance. However, OnlineAttemptHost must
// be deleted on the UI thread.
existing_user_controller_.reset();
- CrosInProcessBrowserTest::CleanUpOnMainThread();
+ DevicePolicyCrosBrowserTest::InProcessBrowserTest::CleanUpOnMainThread();
testing_profile_.reset(NULL);
user_manager_enabler_.reset();
}
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 5604c22..08dd3671 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -12,7 +12,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/webui_login_display.h"
@@ -397,13 +396,12 @@
} // namespace
-class KioskTest : public chromeos::CrosInProcessBrowserTest,
+class KioskTest : public InProcessBrowserTest,
// Param defining is multi-profiles enabled.
public testing::WithParamInterface<bool> {
public:
KioskTest()
- : chromeos::CrosInProcessBrowserTest(),
- original_content_browser_client_(NULL),
+ : original_content_browser_client_(NULL),
test_server_(NULL) {
set_exit_when_last_browser_closes(false);
}
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 3bf47c8..4db9cb04 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/chrome_browser_main_extra_parts.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/login_wizard.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -34,13 +33,13 @@
namespace {
-class LoginTestBase : public chromeos::CrosInProcessBrowserTest {
+class LoginTestBase : public InProcessBrowserTest {
public:
LoginTestBase() {}
protected:
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
- CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+ InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
mock_cryptohome_library_.reset(new chromeos::MockCryptohomeLibrary());
EXPECT_CALL(*(mock_cryptohome_library_.get()), GetSystemSalt())
@@ -136,7 +135,7 @@
};
-class LoginSigninTest : public chromeos::CrosInProcessBrowserTest {
+class LoginSigninTest : public InProcessBrowserTest {
protected:
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(chromeos::switches::kLoginManager);
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 0b9d798..97822a8 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -17,7 +17,6 @@
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/thread.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
#include "chrome/browser/chromeos/login/authenticator.h"
@@ -503,8 +502,6 @@
}
protected:
- ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
-
base::Closure fake_io_thread_work_;
base::WaitableEvent fake_io_thread_completion_;
base::Thread fake_io_thread_;
diff --git a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
index eb651e0..9b85e81 100644
--- a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
+++ b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/run_loop.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/merge_session_load_page.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -81,7 +80,6 @@
}
private:
- ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
ScopedTestDeviceSettingsService test_device_settings_service_;
ScopedTestCrosSettings test_cros_settings_;
scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc
index 24f6f17..b0ffec6 100644
--- a/chrome/browser/chromeos/login/online_attempt_unittest.cc
+++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/auth_attempt_state.h"
#include "chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h"
#include "chrome/browser/chromeos/login/mock_url_fetchers.h"
@@ -64,9 +63,6 @@
TestAttemptState state_;
MockAuthAttemptStateResolver resolver_;
scoped_ptr<OnlineAttempt> attempt_;
-
- // Initializes / shuts down a stub NetworkLibrary.
- ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
};
TEST_F(OnlineAttemptTest, LoginSuccess) {
diff --git a/chrome/browser/chromeos/login/oobe_browsertest.cc b/chrome/browser/chromeos/login/oobe_browsertest.cc
index b07497d3..ea19642 100644
--- a/chrome/browser/chromeos/login/oobe_browsertest.cc
+++ b/chrome/browser/chromeos/login/oobe_browsertest.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/chrome_browser_main_extra_parts.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/webui_login_display.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -128,7 +127,7 @@
const base::FilePath kServiceLogin("chromeos/service_login.html");
-class OobeTest : public chromeos::CrosInProcessBrowserTest {
+class OobeTest : public InProcessBrowserTest {
protected:
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(chromeos::switches::kLoginManager);
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index 9875995..7569a9d 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -12,7 +12,6 @@
#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/mock_login_status_consumer.h"
#include "chrome/browser/chromeos/login/mock_url_fetchers.h"
#include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ -194,7 +193,6 @@
std::string username_hash_;
std::string hash_ascii_;
- ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
ScopedDeviceSettingsTestHelper device_settings_test_helper_;
ScopedTestCrosSettings test_cros_settings_;
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index ad5ee63..83ef117 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -6,7 +6,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/mock_authenticator.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/login/screen_locker_tester.h"
@@ -16,6 +15,7 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/fake_session_manager_client.h"
@@ -88,7 +88,7 @@
namespace chromeos {
-class ScreenLockerTest : public CrosInProcessBrowserTest {
+class ScreenLockerTest : public InProcessBrowserTest {
public:
ScreenLockerTest() : fake_session_manager_client_(NULL) {
}
@@ -118,7 +118,7 @@
MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager =
new MockDBusThreadManagerWithoutGMock;
DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
- CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+ InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
fake_session_manager_client_ =
mock_dbus_thread_manager->fake_session_manager_client();
zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
index 92b94bf..7c88c21 100644
--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
@@ -78,7 +78,7 @@
}
virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
- CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
+ InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
DBusThreadManager::Shutdown();
}
diff --git a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
index 40726a9..3886517 100644
--- a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/mock_login_utils.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
@@ -11,6 +10,7 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chromeos/chromeos_switches.h"
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -27,7 +27,7 @@
namespace chromeos {
-class UserAddingScreenTest : public CrosInProcessBrowserTest,
+class UserAddingScreenTest : public InProcessBrowserTest,
public UserAddingScreen::Observer {
public:
UserAddingScreenTest() : user_adding_started_(0), user_adding_finished_(0) {
diff --git a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
index 19eb7a55..f89e905 100644
--- a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
@@ -11,7 +11,6 @@
#include "base/prefs/pref_service.h"
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/default_user_images.h"
#include "chrome/browser/chromeos/login/mock_user_manager.h"
#include "chrome/browser/chromeos/login/user_image_manager_impl.h"
@@ -19,6 +18,7 @@
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/chromeos_switches.h"
#include "content/public/browser/notification_observer.h"
@@ -34,14 +34,14 @@
const char kTestUser1[] = "[email protected]";
const char kTestUser2[] = "[email protected]";
-class UserImageManagerTest : public CrosInProcessBrowserTest,
+class UserImageManagerTest : public InProcessBrowserTest,
public content::NotificationObserver,
public UserManager::Observer {
protected:
UserImageManagerTest() {
}
- // CrosInProcessBrowserTest overrides:
+ // InProcessBrowserTest overrides:
virtual void SetUpOnMainThread() OVERRIDE {
UserManager::Get()->AddObserver(this);
user_image_manager_ = UserManager::Get()->GetUserImageManager();
diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc
index c26a7642..9a86623 100644
--- a/chrome/browser/chromeos/login/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/user_manager_unittest.cc
@@ -11,7 +11,6 @@
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/user_manager_impl.h"
@@ -127,7 +126,6 @@
scoped_ptr<TestingPrefServiceSimple> local_state_;
ScopedTestDeviceSettingsService test_device_settings_service_;
- ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
ScopedTestCrosSettings test_cros_settings_;
scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
index fe126d89..3b82dcc 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
@@ -16,11 +16,11 @@
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/chromeos_switches.h"
#include "ui/aura/env.h"
@@ -44,7 +44,7 @@
} // namespace
-class WallpaperManagerBrowserTest : public CrosInProcessBrowserTest,
+class WallpaperManagerBrowserTest : public InProcessBrowserTest,
public DesktopBackgroundControllerObserver {
public:
WallpaperManagerBrowserTest () : controller_(NULL),
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc
index 5ed7c9f8c..4dc6cbe 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc
@@ -14,7 +14,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/prefs/pref_service.h"
#include "base/prefs/testing_pref_service.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/user_manager_impl.h"
@@ -95,7 +94,6 @@
scoped_ptr<TestingPrefServiceSimple> local_state_;
ScopedTestDeviceSettingsService test_device_settings_service_;
- ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
ScopedTestCrosSettings test_cros_settings_;
scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
diff --git a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
index daff36b..adf341d 100644
--- a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
+++ b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
@@ -25,7 +25,7 @@
void WizardInProcessBrowserTest::SetUp() {
WizardController::SetZeroDelays();
- CrosInProcessBrowserTest::SetUp();
+ InProcessBrowserTest::SetUp();
}
void WizardInProcessBrowserTest::SetUpCommandLine(CommandLine* command_line) {
diff --git a/chrome/browser/chromeos/login/wizard_in_process_browser_test.h b/chrome/browser/chromeos/login/wizard_in_process_browser_test.h
index 8b888e3f..019edf8 100644
--- a/chrome/browser/chromeos/login/wizard_in_process_browser_test.h
+++ b/chrome/browser/chromeos/login/wizard_in_process_browser_test.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
+#include "chrome/test/base/in_process_browser_test.h"
class Browser;
class Profile;
@@ -22,11 +22,11 @@
// Instead of creating Chrome browser window it creates login wizard window
// with specified parameters and allows to customize environment at the
// right moment in time before wizard is created.
-class WizardInProcessBrowserTest : public CrosInProcessBrowserTest {
+class WizardInProcessBrowserTest : public InProcessBrowserTest {
public:
explicit WizardInProcessBrowserTest(const char* screen_name);
- // Overridden from CrosInProcessBrowserTest:
+ // Overridden from InProcessBrowserTest:
virtual void SetUp() OVERRIDE;
protected:
diff --git a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc
deleted file mode 100644
index d221b66..0000000
--- a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) 2012 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/net/network_change_notifier_network_library.h"
-
-#include <vector>
-
-#include "base/bind.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "content/public/browser/browser_thread.h"
-#include "net/dns/dns_config_service_posix.h"
-
-using content::BrowserThread;
-
-namespace {
-
-// Delay for online change notification reporting.
-const int kOnlineNotificationDelayMS = 500;
-const int kInitialNotificationCheckDelayMS = 1000;
-
-bool IsOnline(chromeos::ConnectionState state) {
- return state == chromeos::STATE_ONLINE ||
- state == chromeos::STATE_PORTAL;
-}
-
-} // namespace
-
-namespace chromeos {
-
-class NetworkChangeNotifierNetworkLibrary::DnsConfigServiceChromeos
- : public net::internal::DnsConfigServicePosix {
- public:
- DnsConfigServiceChromeos() {}
-
- virtual ~DnsConfigServiceChromeos() {}
-
- // net::DnsConfigServicePosix:
- virtual bool StartWatching() OVERRIDE {
- // Notifications from NetworkLibrary are sent to
- // NetworkChangeNotifierNetworkLibrary.
- return true;
- }
-
- void OnNetworkChange() {
- InvalidateConfig();
- InvalidateHosts();
- ReadNow();
- }
-};
-
-NetworkChangeNotifierNetworkLibrary::NetworkChangeNotifierNetworkLibrary()
- : NetworkChangeNotifier(NetworkChangeCalculatorParamsChromeos()),
- has_active_network_(false),
- connection_state_(chromeos::STATE_UNKNOWN),
- connection_type_(CONNECTION_NONE),
- weak_factory_(this) {
- BrowserThread::PostDelayedTask(
- BrowserThread::UI, FROM_HERE,
- base::Bind(
- &NetworkChangeNotifierNetworkLibrary::UpdateInitialState, this),
- base::TimeDelta::FromMilliseconds(kInitialNotificationCheckDelayMS));
-}
-
-NetworkChangeNotifierNetworkLibrary::~NetworkChangeNotifierNetworkLibrary() {
-}
-
-void NetworkChangeNotifierNetworkLibrary::Init() {
- chromeos::NetworkLibrary* network_library =
- chromeos::NetworkLibrary::Get();
- network_library->AddNetworkManagerObserver(this);
- DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
-
- dns_config_service_.reset(new DnsConfigServiceChromeos());
- dns_config_service_->WatchConfig(
- base::Bind(NetworkChangeNotifier::SetDnsConfig));
-
- UpdateNetworkState(network_library);
-}
-
-void NetworkChangeNotifierNetworkLibrary::Shutdown() {
- weak_factory_.InvalidateWeakPtrs();
-
- dns_config_service_.reset();
-
- if (!NetworkLibrary::Get())
- return;
-
- chromeos::NetworkLibrary* lib =
- chromeos::NetworkLibrary::Get();
- lib->RemoveNetworkManagerObserver(this);
- lib->RemoveObserverForAllNetworks(this);
-
- DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
-}
-
-void NetworkChangeNotifierNetworkLibrary::SystemResumed(
- const base::TimeDelta& sleep_duration) {
- // Force invalidation of various net resources on system resume.
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(
- &NetworkChangeNotifier::NotifyObserversOfIPAddressChange));
-}
-
-void NetworkChangeNotifierNetworkLibrary::OnNetworkManagerChanged(
- chromeos::NetworkLibrary* cros) {
- UpdateNetworkState(cros);
-}
-
-net::NetworkChangeNotifier::ConnectionType
-NetworkChangeNotifierNetworkLibrary::GetCurrentConnectionType() const {
- return connection_type_;
-}
-
-void NetworkChangeNotifierNetworkLibrary::OnNetworkChanged(
- chromeos::NetworkLibrary* cros,
- const chromeos::Network* network) {
- CHECK(network);
-
- // Active network changed?
- if (network->service_path() != service_path_)
- UpdateNetworkState(cros);
- else
- UpdateConnectivityState(network);
-}
-
-void NetworkChangeNotifierNetworkLibrary::UpdateNetworkState(
- chromeos::NetworkLibrary* lib) {
- const chromeos::Network* network = lib->active_network();
- // For VPN networks, the device path is empty. See crbug.com/222251
- if (network && network->type() != TYPE_VPN) {
- lib->GetIPConfigs(
- network->device_path(),
- chromeos::NetworkLibrary::FORMAT_COLON_SEPARATED_HEX,
- base::Bind(
- &NetworkChangeNotifierNetworkLibrary::UpdateNetworkStateCallback,
- weak_factory_.GetWeakPtr(),
- lib));
- } else {
- // If we don't have a network, then we can't fetch ipconfigs, but we still
- // need to process state updates when we lose a network (i.e. when
- // has_active_network_ is still set, but we don't have one anymore).
- NetworkIPConfigVector empty_ipconfigs;
- UpdateNetworkStateCallback(lib, empty_ipconfigs, "");
- }
-}
-
-void NetworkChangeNotifierNetworkLibrary::UpdateNetworkStateCallback(
- chromeos::NetworkLibrary* lib,
- const NetworkIPConfigVector& ipconfigs,
- const std::string& hardware_address) {
- const chromeos::Network* network = lib->active_network();
-
- if (network) {
- VLOG(1) << "UpdateNetworkStateCallback: " << network->name()
- << ", type= " << network->type()
- << ", device= " << network->device_path()
- << ", state= " << network->state();
- }
-
- // Find the DNS servers currently in use. This code assumes that the order of
- // the |ipconfigs| is stable.
- std::vector<std::string> ipconfig_name_servers;
- for (chromeos::NetworkIPConfigVector::const_iterator it = ipconfigs.begin();
- it != ipconfigs.end(); ++it) {
- const chromeos::NetworkIPConfig& ipconfig = *it;
- if (!ipconfig.name_servers.empty())
- ipconfig_name_servers.push_back(ipconfig.name_servers);
- }
-
- // Did we loose the active network?
- bool lost_active_network = !network && has_active_network_;
-
- // Did we have a change on the current active network?
- bool changed_active_network = network && (
- !has_active_network_ ||
- network->service_path() != service_path_ ||
- ipconfig_name_servers != name_servers_ ||
- network->ip_address() != ip_address_);
-
- // If just the current active network's state changed, update it if necessary.
- if (!lost_active_network && !changed_active_network &&
- network && network->state() != connection_state_) {
- UpdateConnectivityState(network);
- }
-
- if (lost_active_network || changed_active_network) {
- if (has_active_network_)
- lib->RemoveObserverForAllNetworks(this);
- if (!network) {
- has_active_network_ = false;
- service_path_.clear();
- ip_address_.clear();
- name_servers_.clear();
- } else {
- has_active_network_ = true;
- service_path_ = network->service_path();
- ip_address_ = network->ip_address();
- name_servers_.swap(ipconfig_name_servers);
- }
- dns_config_service_->OnNetworkChange();
- UpdateConnectivityState(network);
- // If there is an active network, add observer to track its changes.
- if (network)
- lib->AddNetworkObserver(network->service_path(), this);
-
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(
- &NetworkChangeNotifier::NotifyObserversOfIPAddressChange));
- }
-}
-
-void NetworkChangeNotifierNetworkLibrary::UpdateConnectivityState(
- const chromeos::Network* network) {
- if (network) {
- VLOG(1) << "UpdateConnectivityState: " << network->name()
- << ", type= " << network->type()
- << ", device= " << network->device_path()
- << ", state= " << network->state()
- << ", connect= " << connection_state_
- << ", type= " << connection_type_;
- }
-
- // We don't care about all transitions of ConnectionState. OnlineStateChange
- // notification should trigger if ConnectionType is changed.
- chromeos::ConnectionState new_connection_state =
- network ? network->connection_state() : chromeos::STATE_UNKNOWN;
-
- ConnectionType prev_connection_type = connection_type_;
- ConnectionType new_connection_type = GetNetworkConnectionType(network);
-
- bool is_online = (new_connection_state == chromeos::STATE_ONLINE);
- bool was_online = (connection_state_ == chromeos::STATE_ONLINE);
- bool is_portal = (new_connection_state == chromeos::STATE_PORTAL);
- bool was_portal = (connection_state_ == chromeos::STATE_PORTAL);
- VLOG(2) << " UpdateConnectivityState2: "
- << "new_cs = " << new_connection_state
- << ", is_online = " << is_online
- << ", was_online = " << was_online
- << ", is_portal = " << is_portal
- << ", was_portal = " << was_portal;
- connection_state_ = new_connection_state;
- connection_type_ = new_connection_type;
- if (new_connection_type != prev_connection_type) {
- VLOG(1) << "UpdateConnectivityState3: "
- << "prev_connection_type = " << prev_connection_type
- << ", new_connection_type = " << new_connection_type;
- ReportConnectionChange();
- }
- VLOG(2) << " UpdateConnectivityState4: "
- << "new_cs = " << new_connection_state
- << ", end_cs_ = " << connection_state_
- << "prev_type = " << prev_connection_type
- << ", new_type_ = " << new_connection_type;
-}
-
-void NetworkChangeNotifierNetworkLibrary::ReportConnectionChange() {
- if (weak_factory_.HasWeakPtrs()) {
- // If we have a pending task, cancel it.
- DVLOG(1) << "ReportConnectionChange: has pending task";
- weak_factory_.InvalidateWeakPtrs();
- DVLOG(1) << "ReportConnectionChange: canceled pending task";
- }
- // Posting task with delay allows us to cancel it when connection type is
- // changed frequently. This should help us avoid transient edge reporting
- // while switching between connection types (e.g. ethernet->wifi).
- base::Closure task = base::Bind(
- &NetworkChangeNotifierNetworkLibrary::ReportConnectionChangeOnUIThread,
- weak_factory_.GetWeakPtr());
-
- BrowserThread::PostDelayedTask(
- BrowserThread::UI, FROM_HERE, task,
- base::TimeDelta::FromMilliseconds(kOnlineNotificationDelayMS));
-}
-
-void NetworkChangeNotifierNetworkLibrary::ReportConnectionChangeOnUIThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(
- &NetworkChangeNotifierNetworkLibrary::
- NotifyObserversOfConnectionTypeChange));
-}
-
-// static
-void NetworkChangeNotifierNetworkLibrary::UpdateInitialState(
- NetworkChangeNotifierNetworkLibrary* self) {
- chromeos::NetworkLibrary* net = chromeos::NetworkLibrary::Get();
- self->UpdateNetworkState(net);
-}
-
-// static
-net::NetworkChangeNotifier::ConnectionType
-NetworkChangeNotifierNetworkLibrary::GetNetworkConnectionType(
- const chromeos::Network* network) {
- if (!network || !IsOnline(network->connection_state()))
- return net::NetworkChangeNotifier::CONNECTION_NONE;
-
- switch (network->type()) {
- case chromeos::TYPE_ETHERNET:
- return CONNECTION_ETHERNET;
- case chromeos::TYPE_WIFI:
- return CONNECTION_WIFI;
- case chromeos::TYPE_WIMAX:
- return CONNECTION_4G;
- case chromeos::TYPE_CELLULAR:
- switch (static_cast<const chromeos::CellularNetwork*>(
- network)->network_technology()) {
- case chromeos::NETWORK_TECHNOLOGY_UNKNOWN:
- case chromeos::NETWORK_TECHNOLOGY_1XRTT:
- case chromeos::NETWORK_TECHNOLOGY_GPRS:
- case chromeos::NETWORK_TECHNOLOGY_EDGE:
- return CONNECTION_2G;
- case chromeos::NETWORK_TECHNOLOGY_GSM:
- case chromeos::NETWORK_TECHNOLOGY_UMTS:
- case chromeos::NETWORK_TECHNOLOGY_EVDO:
- case chromeos::NETWORK_TECHNOLOGY_HSPA:
- return CONNECTION_3G;
- case chromeos::NETWORK_TECHNOLOGY_HSPA_PLUS:
- case chromeos::NETWORK_TECHNOLOGY_LTE:
- case chromeos::NETWORK_TECHNOLOGY_LTE_ADVANCED:
- return CONNECTION_4G;
- }
- case chromeos::TYPE_BLUETOOTH:
- case chromeos::TYPE_VPN:
- case chromeos::TYPE_UNKNOWN:
- break;
- }
- return net::NetworkChangeNotifier::CONNECTION_UNKNOWN;
-}
-
-// static
-net::NetworkChangeNotifier::NetworkChangeCalculatorParams
-NetworkChangeNotifierNetworkLibrary::NetworkChangeCalculatorParamsChromeos() {
- NetworkChangeCalculatorParams params;
- // Delay values arrived at by simple experimentation and adjusted so as to
- // produce a single signal when switching between network connections.
- params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
- params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000);
- params.connection_type_offline_delay_ = base::TimeDelta::FromMilliseconds(0);
- params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(0);
- return params;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/net/network_change_notifier_network_library.h b/chrome/browser/chromeos/net/network_change_notifier_network_library.h
deleted file mode 100644
index 8cd9eafc..0000000
--- a/chrome/browser/chromeos/net/network_change_notifier_network_library.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_NETWORK_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_NETWORK_LIBRARY_H_
-
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
-#include "chromeos/dbus/power_manager_client.h"
-#include "net/base/network_change_notifier.h"
-
-namespace chromeos {
-
-class OnlineStatusReportThreadTask;
-
-class NetworkChangeNotifierNetworkLibrary
- : public net::NetworkChangeNotifier,
- public chromeos::PowerManagerClient::Observer,
- public chromeos::NetworkLibrary::NetworkObserver,
- public chromeos::NetworkLibrary::NetworkManagerObserver {
- public:
- NetworkChangeNotifierNetworkLibrary();
- virtual ~NetworkChangeNotifierNetworkLibrary();
-
- // Initializes the network change notifier. Starts to observe changes
- // from the power manager and the network manager.
- void Init();
-
- // Shutdowns the network change notifier. Stops observing changes from
- // the power manager and the network manager.
- void Shutdown();
-
- private:
- friend class OnlineStatusReportThreadTask;
-
- class DnsConfigServiceChromeos;
-
- // PowerManagerClient::Observer overrides:
- virtual void SystemResumed(const base::TimeDelta& sleep_duration) OVERRIDE;
-
- // NetworkChangeNotifier overrides:
- virtual net::NetworkChangeNotifier::ConnectionType
- GetCurrentConnectionType() const OVERRIDE;
-
- // NetworkManagerObserver overrides:
- virtual void OnNetworkManagerChanged(chromeos::NetworkLibrary* obj) OVERRIDE;
-
- // NetworkObserver overrides:
- virtual void OnNetworkChanged(chromeos::NetworkLibrary* cros,
- const chromeos::Network* network) OVERRIDE;
-
- // Initiate online status change reporting.
- void ReportConnectionChange();
- void ReportConnectionChangeOnUIThread();
- // Callback from online_notification_task_ when online state notification
- // is actually scheduled.
- void OnOnlineStateNotificationFired();
-
- // Initiates an update of data members that keep the track the network stack
- // state.
- void UpdateNetworkState(chromeos::NetworkLibrary* cros);
- // Called when a network state update has completed. Updates data members that
- // keep the track the network stack state.
- void UpdateNetworkStateCallback(chromeos::NetworkLibrary* cros,
- const NetworkIPConfigVector& ip_configs,
- const std::string& hardware_address);
- // Updates network connectivity state.
- void UpdateConnectivityState(const chromeos::Network* network);
-
- // Updates the initial state. Lets us trigger initial eval of the
- // connectivity status without waiting for an event from the connection
- // manager.
- static void UpdateInitialState(NetworkChangeNotifierNetworkLibrary* self);
-
- // Gets connection type for given |network|.
- static net::NetworkChangeNotifier::ConnectionType GetNetworkConnectionType(
- const chromeos::Network* network);
-
- // Get parameters for calculating new combined signal.
- static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsChromeos();
-
- // True if we previously had an active network around.
- bool has_active_network_;
- // Current active network's connection state.
- chromeos::ConnectionState connection_state_;
- // Current active network's connection type.
- net::NetworkChangeNotifier::ConnectionType connection_type_;
- // Current active network's service path.
- std::string service_path_;
- // Current active network's IP address.
- std::string ip_address_;
- // Current active network's name servers.
- std::vector<std::string> name_servers_;
-
- scoped_ptr<DnsConfigServiceChromeos> dns_config_service_;
-
- base::WeakPtrFactory<NetworkChangeNotifierNetworkLibrary> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierNetworkLibrary);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_NETWORK_LIBRARY_H_
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
index 1ee5ae9c..8b82333 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
@@ -61,7 +61,7 @@
void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() {
chromeos::DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_);
- CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+ InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
}
void DevicePolicyCrosBrowserTest::InstallOwnerKey() {
@@ -88,7 +88,7 @@
}
void DevicePolicyCrosBrowserTest::TearDownInProcessBrowserTestFixture() {
- CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
+ InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
chromeos::DBusThreadManager::Shutdown();
}
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
index 41efb7f..0057b8d 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
@@ -8,9 +8,9 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/files/scoped_temp_dir.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/policy/device_policy_builder.h"
#include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chromeos/dbus/fake_session_manager_client.h"
#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -18,8 +18,7 @@
namespace policy {
// Used to test Device policy changes in Chrome OS.
-class DevicePolicyCrosBrowserTest :
- public chromeos::CrosInProcessBrowserTest {
+class DevicePolicyCrosBrowserTest : public InProcessBrowserTest {
public:
// Marks the device as enterprise-owned. Must be called to make device
// policies apply Chrome-wide. If this is not called, device policies will
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc
deleted file mode 100644
index 6208711..0000000
--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc
+++ /dev/null
@@ -1,418 +0,0 @@
-// Copyright (c) 2012 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/policy/network_configuration_updater_impl_cros.h"
-
-#include "base/callback.h"
-#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
-#include "base/values.h"
-#include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/policy/external_data_fetcher.h"
-#include "chrome/browser/policy/mock_configuration_policy_provider.h"
-#include "chrome/browser/policy/policy_map.h"
-#include "chrome/browser/policy/policy_service_impl.h"
-#include "chromeos/network/onc/mock_certificate_importer.h"
-#include "chromeos/network/onc/onc_constants.h"
-#include "chromeos/network/onc/onc_test_utils.h"
-#include "chromeos/network/onc/onc_utils.h"
-#include "content/public/test/test_browser_thread.h"
-#include "content/public/test/test_utils.h"
-#include "net/base/test_data_directory.h"
-#include "net/cert/cert_trust_anchor_provider.h"
-#include "net/cert/x509_certificate.h"
-#include "net/test/cert_test_util.h"
-#include "policy/policy_constants.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using testing::AnyNumber;
-using testing::Mock;
-using testing::Ne;
-using testing::Return;
-using testing::StrictMock;
-using testing::_;
-
-namespace onc = ::chromeos::onc;
-
-namespace policy {
-
-namespace {
-
-const char kFakeONC[] =
- "{ \"NetworkConfigurations\": ["
- " { \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5040}\","
- " \"Type\": \"WiFi\","
- " \"Name\": \"My WiFi Network\","
- " \"WiFi\": {"
- " \"SSID\": \"ssid-none\","
- " \"Security\": \"None\" }"
- " }"
- " ],"
- " \"Certificates\": ["
- " { \"GUID\": \"{f998f760-272b-6939-4c2beffe428697ac}\","
- " \"PKCS12\": \"abc\","
- " \"Type\": \"Client\" }"
- " ],"
- " \"Type\": \"UnencryptedConfiguration\""
- "}";
-
-std::string ValueToString(const base::Value* value) {
- std::stringstream str;
- str << *value;
- return str.str();
-}
-
-// Matcher to match base::Value.
-MATCHER_P(IsEqualTo,
- value,
- std::string(negation ? "isn't" : "is") + " equal to " +
- ValueToString(value)) {
- return value->Equals(&arg);
-}
-
-ACTION_P(SetCertificateList, list) {
- *arg2 = list;
- return true;
-}
-
-ACTION_P(SetImportedCerts, map) {
- *arg3 = map;
- return true;
-}
-
-} // namespace
-
-// Tests of NetworkConfigurationUpdaterImplCros
-class NetworkConfigurationUpdaterTest : public testing::Test {
- protected:
- NetworkConfigurationUpdaterTest()
- : ui_thread_(content::BrowserThread::UI, &loop_),
- io_thread_(content::BrowserThread::IO, &loop_) {}
-
- virtual void SetUp() OVERRIDE {
- EXPECT_CALL(provider_, IsInitializationComplete(_))
- .WillRepeatedly(Return(true));
- provider_.Init();
- PolicyServiceImpl::Providers providers;
- providers.push_back(&provider_);
- policy_service_.reset(new PolicyServiceImpl(providers));
-
- empty_network_configs_.reset(new base::ListValue);
- empty_certificates_.reset(new base::ListValue);
-
- scoped_ptr<base::DictionaryValue> fake_toplevel_onc =
- onc::ReadDictionaryFromJson(kFakeONC);
-
- scoped_ptr<base::Value> network_configs_value;
- base::ListValue* network_configs = NULL;
- fake_toplevel_onc->RemoveWithoutPathExpansion(
- onc::toplevel_config::kNetworkConfigurations,
- &network_configs_value);
- network_configs_value.release()->GetAsList(&network_configs);
- fake_network_configs_.reset(network_configs);
-
- scoped_ptr<base::Value> certs_value;
- base::ListValue* certs = NULL;
- fake_toplevel_onc->RemoveWithoutPathExpansion(
- onc::toplevel_config::kCertificates,
- &certs_value);
- certs_value.release()->GetAsList(&certs);
- fake_certificates_.reset(certs);
- }
-
- virtual void TearDown() OVERRIDE {
- provider_.Shutdown();
- content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
- }
-
- void UpdateProviderPolicy(const PolicyMap& policy) {
- provider_.UpdateChromePolicy(policy);
- base::RunLoop loop;
- loop.RunUntilIdle();
- }
-
- // Maps configuration policy name to corresponding ONC source.
- static onc::ONCSource NameToONCSource(
- const std::string& name) {
- if (name == key::kDeviceOpenNetworkConfiguration)
- return onc::ONC_SOURCE_DEVICE_POLICY;
- if (name == key::kOpenNetworkConfiguration)
- return onc::ONC_SOURCE_USER_POLICY;
- return onc::ONC_SOURCE_NONE;
- }
-
- scoped_ptr<base::ListValue> empty_network_configs_;
- scoped_ptr<base::ListValue> empty_certificates_;
- scoped_ptr<base::ListValue> fake_network_configs_;
- scoped_ptr<base::ListValue> fake_certificates_;
- StrictMock<chromeos::MockNetworkLibrary> network_library_;
- StrictMock<MockConfigurationPolicyProvider> provider_;
- scoped_ptr<PolicyServiceImpl> policy_service_;
- base::MessageLoop loop_;
- content::TestBrowserThread ui_thread_;
- content::TestBrowserThread io_thread_;
-};
-
-TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) {
- std::string onc_policy =
- onc::test_utils::ReadTestData("toplevel_partially_invalid.onc");
-
- scoped_ptr<base::DictionaryValue> onc_repaired =
- onc::test_utils::ReadTestDictionary(
- "repaired_toplevel_partially_invalid.onc");
-
- base::ListValue* network_configs_repaired = NULL;
- onc_repaired->GetListWithoutPathExpansion(
- onc::toplevel_config::kNetworkConfigurations,
- &network_configs_repaired);
- ASSERT_TRUE(network_configs_repaired);
-
- PolicyMap policy;
- policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, Value::CreateStringValue(onc_policy), NULL);
- UpdateProviderPolicy(policy);
-
- EXPECT_CALL(network_library_, AddNetworkProfileObserver(_));
-
- // Ignore the device policy update.
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _));
- StrictMock<chromeos::onc::MockCertificateImporter>* certificate_importer =
- new StrictMock<chromeos::onc::MockCertificateImporter>();
- EXPECT_CALL(*certificate_importer, ImportCertificates(_, _, _));
-
- NetworkConfigurationUpdaterImplCros updater(
- policy_service_.get(),
- &network_library_,
- make_scoped_ptr<chromeos::onc::CertificateImporter>(
- certificate_importer));
- Mock::VerifyAndClearExpectations(&network_library_);
- Mock::VerifyAndClearExpectations(&certificate_importer);
-
- // After the user policy is initialized, we always push both policies to the
- // NetworkLibrary. Ignore the device policy.
- EXPECT_CALL(network_library_, LoadOncNetworks(
- _, onc::ONC_SOURCE_DEVICE_POLICY));
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(network_configs_repaired),
- onc::ONC_SOURCE_USER_POLICY));
- EXPECT_CALL(*certificate_importer,
- ImportCertificates(_, chromeos::onc::ONC_SOURCE_DEVICE_POLICY,
- _));
- EXPECT_CALL(*certificate_importer,
- ImportCertificates(_, chromeos::onc::ONC_SOURCE_USER_POLICY,
- _));
-
- EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));
-
- updater.SetUserPolicyService(false, "hash", policy_service_.get());
- updater.UnsetUserPolicyService();
-}
-
-class NetworkConfigurationUpdaterTestWithParam
- : public NetworkConfigurationUpdaterTest,
- public testing::WithParamInterface<const char*> {
-};
-
-TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) {
- PolicyMap policy;
- policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- Value::CreateStringValue(kFakeONC), NULL);
- UpdateProviderPolicy(policy);
-
- EXPECT_CALL(network_library_, AddNetworkProfileObserver(_));
-
- // Initially, only the device policy is applied. The user policy is only
- // applied after the user profile was initialized.
- base::ListValue* device_networks;
- base::ListValue* device_certs;
- base::ListValue* user_networks;
- base::ListValue* user_certs;
- if (GetParam() == key::kDeviceOpenNetworkConfiguration) {
- device_networks = fake_network_configs_.get();
- device_certs = fake_certificates_.get();
- user_networks = empty_network_configs_.get();
- user_certs = empty_certificates_.get();
- } else {
- device_networks = empty_network_configs_.get();
- device_certs = empty_certificates_.get();
- user_networks = fake_network_configs_.get();
- user_certs = fake_certificates_.get();
- }
-
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(device_networks), onc::ONC_SOURCE_DEVICE_POLICY));
- StrictMock<chromeos::onc::MockCertificateImporter>* certificate_importer =
- new StrictMock<chromeos::onc::MockCertificateImporter>();
- EXPECT_CALL(*certificate_importer, ImportCertificates(
- IsEqualTo(device_certs), onc::ONC_SOURCE_DEVICE_POLICY, _));
-
- NetworkConfigurationUpdaterImplCros updater(
- policy_service_.get(),
- &network_library_,
- make_scoped_ptr<chromeos::onc::CertificateImporter>(
- certificate_importer));
- Mock::VerifyAndClearExpectations(&network_library_);
- Mock::VerifyAndClearExpectations(&certificate_importer);
-
- // After the user policy is initialized, we always push both policies to the
- // NetworkLibrary.
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(device_networks), onc::ONC_SOURCE_DEVICE_POLICY));
- EXPECT_CALL(*certificate_importer, ImportCertificates(
- IsEqualTo(device_certs), onc::ONC_SOURCE_DEVICE_POLICY, _));
-
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(user_networks), onc::ONC_SOURCE_USER_POLICY));
- EXPECT_CALL(*certificate_importer, ImportCertificates(
- IsEqualTo(user_certs), onc::ONC_SOURCE_USER_POLICY, _));
-
- EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));
-
- // We just need an initialized PolicyService, so we can reuse
- // |policy_service_|.
- updater.SetUserPolicyService(false, "hash", policy_service_.get());
- updater.UnsetUserPolicyService();
-}
-
-TEST_P(NetworkConfigurationUpdaterTestWithParam,
- AllowTrustedCertificatesFromPolicy) {
- EXPECT_CALL(network_library_, AddNetworkProfileObserver(_));
-
- const net::CertificateList empty_cert_list;
-
- const net::CertificateList cert_list =
- net::CreateCertificateListFromFile(net::GetTestCertsDirectory(),
- "ok_cert.pem",
- net::X509Certificate::FORMAT_AUTO);
- ASSERT_EQ(1u, cert_list.size());
-
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _)).Times(AnyNumber());
- StrictMock<chromeos::onc::MockCertificateImporter>* certificate_importer =
- new StrictMock<chromeos::onc::MockCertificateImporter>();
- EXPECT_CALL(*certificate_importer, ImportCertificates(_, _, _))
- .WillRepeatedly(SetCertificateList(empty_cert_list));
- NetworkConfigurationUpdaterImplCros updater(
- policy_service_.get(),
- &network_library_,
- make_scoped_ptr<chromeos::onc::CertificateImporter>(
- certificate_importer));
- net::CertTrustAnchorProvider* trust_provider =
- updater.GetCertTrustAnchorProvider();
- ASSERT_TRUE(trust_provider);
- // The initial list of trust anchors is empty.
- content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
- EXPECT_TRUE(trust_provider->GetAdditionalTrustAnchors().empty());
-
- // Initially, certificates imported from policy don't have trust flags.
- updater.SetUserPolicyService(false, "hash", policy_service_.get());
- content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
- Mock::VerifyAndClearExpectations(&network_library_);
- Mock::VerifyAndClearExpectations(&certificate_importer);
- EXPECT_TRUE(trust_provider->GetAdditionalTrustAnchors().empty());
-
- // Certificates with the "Web" trust flag set should be forwarded to the
- // trust provider.
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _));
- EXPECT_CALL(*certificate_importer, ImportCertificates(_, _, _))
- .WillRepeatedly(SetCertificateList(empty_cert_list));
- onc::ONCSource current_source = NameToONCSource(GetParam());
- EXPECT_CALL(network_library_, LoadOncNetworks(_, current_source));
- EXPECT_CALL(*certificate_importer, ImportCertificates(_, current_source, _))
- .WillRepeatedly(SetCertificateList(cert_list));
- // Trigger a new policy load, and spin the IO message loop to pass the
- // certificates to the |trust_provider| on the IO thread.
- updater.SetUserPolicyService(true, "hash", policy_service_.get());
- base::RunLoop loop;
- loop.RunUntilIdle();
- Mock::VerifyAndClearExpectations(&network_library_);
- Mock::VerifyAndClearExpectations(&certificate_importer);
-
- // Certificates are only provided as trust anchors if they come from user
- // policy.
- size_t expected_certs = 0u;
- if (GetParam() == key::kOpenNetworkConfiguration)
- expected_certs = 1u;
- EXPECT_EQ(expected_certs,
- trust_provider->GetAdditionalTrustAnchors().size());
-
- EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));
- updater.UnsetUserPolicyService();
-}
-
-TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) {
- EXPECT_CALL(network_library_, AddNetworkProfileObserver(_));
-
- // Ignore the initial updates.
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _))
- .Times(AnyNumber());
- StrictMock<chromeos::onc::MockCertificateImporter>* certificate_importer =
- new StrictMock<chromeos::onc::MockCertificateImporter>();
- EXPECT_CALL(*certificate_importer, ImportCertificates(_, _, _))
- .Times(AnyNumber());
- NetworkConfigurationUpdaterImplCros updater(
- policy_service_.get(),
- &network_library_,
- make_scoped_ptr<chromeos::onc::CertificateImporter>(
- certificate_importer));
- updater.SetUserPolicyService(false, "hash", policy_service_.get());
- Mock::VerifyAndClearExpectations(&network_library_);
- Mock::VerifyAndClearExpectations(&certificate_importer);
-
- // We should update if policy changes.
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(fake_network_configs_.get()), NameToONCSource(GetParam())));
- EXPECT_CALL(*certificate_importer, ImportCertificates(
- IsEqualTo(fake_certificates_.get()), NameToONCSource(GetParam()), _));
-
- // In the current implementation, we always apply both policies.
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(empty_network_configs_.get()),
- Ne(NameToONCSource(GetParam()))));
- EXPECT_CALL(*certificate_importer, ImportCertificates(
- IsEqualTo(empty_certificates_.get()),
- Ne(NameToONCSource(GetParam())),
- _));
-
- PolicyMap policy;
- policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- Value::CreateStringValue(kFakeONC), NULL);
- UpdateProviderPolicy(policy);
- Mock::VerifyAndClearExpectations(&network_library_);
- Mock::VerifyAndClearExpectations(&certificate_importer);
-
- // Another update is expected if the policy goes away. In the current
- // implementation, we always apply both policies.
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(empty_network_configs_.get()),
- onc::ONC_SOURCE_DEVICE_POLICY));
- EXPECT_CALL(*certificate_importer, ImportCertificates(
- IsEqualTo(empty_certificates_.get()),
- onc::ONC_SOURCE_DEVICE_POLICY,
- _));
-
- EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(empty_network_configs_.get()),
- onc::ONC_SOURCE_USER_POLICY));
- EXPECT_CALL(*certificate_importer, ImportCertificates(
- IsEqualTo(empty_certificates_.get()),
- onc::ONC_SOURCE_USER_POLICY,
- _));
-
- EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));
-
- policy.Erase(GetParam());
- UpdateProviderPolicy(policy);
- updater.UnsetUserPolicyService();
-}
-
-INSTANTIATE_TEST_CASE_P(
- NetworkConfigurationUpdaterTestWithParamInstance,
- NetworkConfigurationUpdaterTestWithParam,
- testing::Values(key::kDeviceOpenNetworkConfiguration,
- key::kOpenNetworkConfiguration));
-
-} // namespace policy
diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
index 852d11cf..4e8a0a2 100644
--- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
+++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
@@ -7,8 +7,8 @@
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread.h"
@@ -31,7 +31,7 @@
namespace chromeos {
-class PeripheralBatteryObserverTest : public CrosInProcessBrowserTest {
+class PeripheralBatteryObserverTest : public InProcessBrowserTest {
public:
PeripheralBatteryObserverTest () {}
virtual ~PeripheralBatteryObserverTest () {}
@@ -40,7 +40,7 @@
MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager =
new MockDBusThreadManagerWithoutGMock;
DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
- CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+ InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
}
virtual void SetUpOnMainThread() OVERRIDE {
@@ -52,7 +52,7 @@
}
virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
- CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
+ InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
DBusThreadManager::Shutdown();
}
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index 5370b98..47649cf6 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
-#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
@@ -29,6 +28,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/login/login_state.h"
@@ -54,7 +54,7 @@
}
class TrayAccessibilityTest
- : public CrosInProcessBrowserTest,
+ : public InProcessBrowserTest,
public WithParamInterface<PrefSettingMechanism> {
protected:
TrayAccessibilityTest() {}
@@ -83,7 +83,7 @@
virtual void RunTestOnMainThreadLoop() OVERRIDE {
// Need to mark oobe completed to show detailed views.
StartupUtils::MarkOobeCompleted();
- CrosInProcessBrowserTest::RunTestOnMainThreadLoop();
+ InProcessBrowserTest::RunTestOnMainThreadLoop();
}
void SetShowAccessibilityOptionsInSystemTrayMenu(bool value) {
