BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/chromium/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc b/chromium/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc
index 74e8911e005..24934f6a747 100644
--- a/chromium/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc
+++ b/chromium/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc
@@ -56,7 +56,7 @@ PlatformKeysTestBase::~PlatformKeysTestBase() {}
 
 void PlatformKeysTestBase::SetUp() {
   base::FilePath test_data_dir;
-  PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+  base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
   embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
 
   embedded_test_server()->RegisterRequestHandler(base::BindRepeating(
@@ -72,11 +72,11 @@ void PlatformKeysTestBase::SetUp() {
       GaiaUrls::GetInstance()->gaia_url().host(),
       embedded_test_server()->base_url()));
 
-  ExtensionApiTest::SetUp();
+  extensions::ExtensionApiTest::SetUp();
 }
 
 void PlatformKeysTestBase::SetUpCommandLine(base::CommandLine* command_line) {
-  ExtensionApiTest::SetUpCommandLine(command_line);
+  extensions::ExtensionApiTest::SetUpCommandLine(command_line);
 
   policy::affiliation_test_helper::AppendCommandLineSwitchesForLoginManager(
       command_line);
@@ -91,7 +91,7 @@ void PlatformKeysTestBase::SetUpCommandLine(base::CommandLine* command_line) {
 }
 
 void PlatformKeysTestBase::SetUpInProcessBrowserTestFixture() {
-  ExtensionApiTest::SetUpInProcessBrowserTestFixture();
+  extensions::ExtensionApiTest::SetUpInProcessBrowserTestFixture();
 
   chromeos::FakeSessionManagerClient* fake_session_manager_client =
       new chromeos::FakeSessionManagerClient;
@@ -162,11 +162,11 @@ void PlatformKeysTestBase::SetUpOnMainThread() {
     loop.Run();
   }
 
-  ExtensionApiTest::SetUpOnMainThread();
+  extensions::ExtensionApiTest::SetUpOnMainThread();
 }
 
 void PlatformKeysTestBase::TearDownOnMainThread() {
-  ExtensionApiTest::TearDownOnMainThread();
+  extensions::ExtensionApiTest::TearDownOnMainThread();
 
   if (system_token_status() == SystemTokenStatus::EXISTS) {
     base::RunLoop loop;