Commit bf54ec93 authored by Qiang Xu's avatar Qiang Xu Committed by Commit Bot

remove dead code in preferences_chromeos_browsertest

Bug: none
Test: still compiles
Change-Id: Ie57ac85850a2dc2fa6985b216a77c339658f472a
Reviewed-on: https://chromium-review.googlesource.com/876492Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Qiang(Joe) Xu <warx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#530657}
parent 97501463
...@@ -5,37 +5,23 @@ ...@@ -5,37 +5,23 @@
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <set>
#include <string>
#include "base/command_line.h" #include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
#include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/login_manager_test.h"
#include "chrome/browser/chromeos/login/startup_utils.h" #include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
#include "chrome/browser/chromeos/preferences.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
#include "chrome/browser/chromeos/system/fake_input_device_settings.h" #include "chrome/browser/chromeos/system/fake_input_device_settings.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chromeos/chromeos_switches.h" #include "chromeos/chromeos_switches.h"
#include "components/feedback/tracing_manager.h" #include "components/feedback/tracing_manager.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "components/prefs/pref_store.h"
#include "components/prefs/writeable_pref_store.h"
#include "components/user_manager/user_manager.h" #include "components/user_manager/user_manager.h"
#include "content/public/common/service_manager_connection.h"
#include "content/public/test/test_utils.h" #include "content/public/test/test_utils.h"
#include "services/service_manager/public/cpp/connector.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ime/chromeos/fake_ime_keyboard.h" #include "ui/base/ime/chromeos/fake_ime_keyboard.h"
#include "ui/events/event_utils.h" #include "ui/events/event_utils.h"
...@@ -141,61 +127,6 @@ class PreferencesTest : public LoginManagerTest { ...@@ -141,61 +127,6 @@ class PreferencesTest : public LoginManagerTest {
DISALLOW_COPY_AND_ASSIGN(PreferencesTest); DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
}; };
class PreferencesServiceBrowserTest : public InProcessBrowserTest {
public:
PreferencesServiceBrowserTest() {}
protected:
static service_manager::Connector* connector() {
return content::ServiceManagerConnection::GetForProcess()->GetConnector();
}
void WaitForPrefChange(PrefStore* store, const std::string& key) {
base::RunLoop run_loop;
TestPrefObserver observer(key, run_loop.QuitClosure());
store->AddObserver(&observer);
run_loop.Run();
store->RemoveObserver(&observer);
}
bool GetIntegerPrefValue(PrefStore* store,
const std::string& key,
int* out_value) {
const base::Value* value = nullptr;
if (!store->GetValue(key, &value))
return false;
return value->GetAsInteger(out_value);
}
private:
class TestPrefObserver : public PrefStore::Observer {
public:
TestPrefObserver(const std::string& pref_name,
const base::Closure& callback)
: pref_name_(pref_name), callback_(callback) {}
~TestPrefObserver() override {}
// PrefStore::Observer:
void OnPrefValueChanged(const std::string& key) override {
if (key == pref_name_)
callback_.Run();
}
void OnInitializationCompleted(bool success) override {
ASSERT_TRUE(success);
}
private:
const std::string pref_name_;
const base::Closure callback_;
DISALLOW_COPY_AND_ASSIGN(TestPrefObserver);
};
DISALLOW_COPY_AND_ASSIGN(PreferencesServiceBrowserTest);
};
IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) { IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) {
RegisterUser(test_users_[0]); RegisterUser(test_users_[0]);
RegisterUser(test_users_[1]); RegisterUser(test_users_[1]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment