chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc - Issue 2664753002: Remove base::StringValue

Unified Diff: chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

Issue 2664753002: Remove base::StringValue (Closed)

Patch Set: Rebase Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc ('k') | chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

index b6af890010a6f5cdea604cf952f2e0af2fd5d6ea..99c50f7f9457e3c2c9c675a9b83f1443cb930ffd 100644

--- a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

+++ b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

@@ -256,7 +256,7 @@ class ArcSettingsServiceTest : public InProcessBrowserTest {

chromeos::DBusThreadManager::Get()

->GetShillServiceClient()

->GetTestInterface();

- base::StringValue value(shill::kStateIdle);

+ base::Value value(shill::kStateIdle);

service_test->SetServiceProperty(service_path, shill::kStateProperty,

value);

RunUntilIdle();

@@ -274,7 +274,7 @@ class ArcSettingsServiceTest : public InProcessBrowserTest {

shill::kStateOnline, true /* add_to_visible */);

service_test->SetServiceProperty(service_path, shill::kProfileProperty,

- base::StringValue(kUserProfilePath));

+ base::Value(kUserProfilePath));

RunUntilIdle();

}

@@ -312,7 +312,7 @@ class ArcSettingsServiceTest : public InProcessBrowserTest {

true /* add_to_visible */);

service_test->SetServiceProperty(kDefaultServicePath,

shill::kProfileProperty,

- base::StringValue(kUserProfilePath));

+ base::Value(kUserProfilePath));

}

policy::MockConfigurationPolicyProvider provider_;

@@ -456,7 +456,7 @@ IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, ProxyModePolicyTest) {

policy.Set(

policy::key::kProxyMode, policy::POLICY_LEVEL_MANDATORY,

policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,

- base::MakeUnique<base::StringValue>(ProxyPrefs::kAutoDetectProxyModeName),

+ base::MakeUnique<base::Value>(ProxyPrefs::kAutoDetectProxyModeName),

nullptr);

UpdatePolicy(policy);

@@ -477,7 +477,7 @@ IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, ONCProxyPolicyTest) {

policy.Set(policy::key::kOpenNetworkConfiguration,

policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,

policy::POLICY_SOURCE_CLOUD,

- base::MakeUnique<base::StringValue>(kONCPolicy), nullptr);

+ base::MakeUnique<base::Value>(kONCPolicy), nullptr);

UpdatePolicy(policy);

std::unique_ptr<base::DictionaryValue> expected_proxy_config(

@@ -496,14 +496,14 @@ IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, TwoSourcesTest) {

policy::PolicyMap policy;

// Proxy policy.

- policy.Set(policy::key::kProxyMode, policy::POLICY_LEVEL_MANDATORY,

- policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,

- base::MakeUnique<base::StringValue>(

- ProxyPrefs::kFixedServersProxyModeName),

- nullptr);

+ policy.Set(

+ policy::key::kProxyMode, policy::POLICY_LEVEL_MANDATORY,

+ policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,

+ base::MakeUnique<base::Value>(ProxyPrefs::kFixedServersProxyModeName),

+ nullptr);

policy.Set(policy::key::kProxyServer, policy::POLICY_LEVEL_MANDATORY,

policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,

- base::MakeUnique<base::StringValue>("proxy:8888"), nullptr);

+ base::MakeUnique<base::Value>("proxy:8888"), nullptr);

UpdatePolicy(policy);

std::unique_ptr<base::DictionaryValue> proxy_config(

@@ -641,11 +641,11 @@ IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, TwoONCProxyPolicyTest) {

policy.Set(policy::key::kOpenNetworkConfiguration,

policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,

policy::POLICY_SOURCE_CLOUD,

- base::MakeUnique<base::StringValue>(kUserONCPolicy), nullptr);

+ base::MakeUnique<base::Value>(kUserONCPolicy), nullptr);

policy.Set(policy::key::kDeviceOpenNetworkConfiguration,

policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_MACHINE,

policy::POLICY_SOURCE_CLOUD,

- base::MakeUnique<base::StringValue>(kDeviceONCPolicy), nullptr);

+ base::MakeUnique<base::Value>(kDeviceONCPolicy), nullptr);

UpdatePolicy(policy);

std::unique_ptr<base::DictionaryValue> expected_proxy_config(