| Index: chrome/browser/extensions/api/identity/identity_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
|
| index a2881ef0c7b14c6db104d7ec6a407e66db30786f..2ef62780573c4b1df547219c0c55e766e7dece61 100644
|
| --- a/chrome/browser/extensions/api/identity/identity_apitest.cc
|
| +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
|
| @@ -401,7 +401,7 @@ gaia::AccountIds CreateIds(std::string email, std::string obfid) {
|
| }
|
|
|
| class IdentityGetAccountsFunctionTest : public ExtensionBrowserTest {
|
| - void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| ExtensionBrowserTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kExtensionsMultiAccount);
|
| }
|
| @@ -513,7 +513,7 @@ IN_PROC_BROWSER_TEST_F(IdentityGetAccountsFunctionTest, TwoAccountsSignedIn) {
|
|
|
| class IdentityOldProfilesGetAccountsFunctionTest
|
| : public IdentityGetAccountsFunctionTest {
|
| - void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| // Don't add the multi-account switch that parent class would have.
|
| }
|
| };
|
| @@ -657,7 +657,7 @@ IN_PROC_BROWSER_TEST_F(IdentityGetProfileUserInfoFunctionTest,
|
|
|
| class GetAuthTokenFunctionTest : public IdentityTestWithSignin {
|
| public:
|
| - void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| IdentityTestWithSignin::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kExtensionsMultiAccount);
|
| }
|
| @@ -861,7 +861,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
|
| SignIn("primary@example.com");
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
| @@ -885,7 +886,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
|
| SignIn("primary@example.com");
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
| @@ -1662,7 +1664,7 @@ IN_PROC_BROWSER_TEST_F(RemoveCachedAuthTokenFunctionTest, MatchingToken) {
|
|
|
| class LaunchWebAuthFlowFunctionTest : public AsyncExtensionBrowserTest {
|
| public:
|
| - void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| AsyncExtensionBrowserTest::SetUpCommandLine(command_line);
|
| // Reduce performance test variance by disabling background networking.
|
| command_line->AppendSwitch(switches::kDisableBackgroundNetworking);
|
| @@ -1742,7 +1744,8 @@ IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, LoadFailed) {
|
| IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, NonInteractiveSuccess) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
| @@ -1768,7 +1771,8 @@ IN_PROC_BROWSER_TEST_F(
|
| LaunchWebAuthFlowFunctionTest, InteractiveFirstNavigationSuccess) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
|
|