X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fprofiles%2Fprofile_browsertest.cc;h=e5eeffd3b609769ed71b1ef0c76a055aa2c55aa1;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=1213ff3f1fe231ef9b6947a92089f461fea5bdf3;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/profiles/profile_browsertest.cc b/src/chrome/browser/profiles/profile_browsertest.cc index 1213ff3..e5eeffd 100644 --- a/src/chrome/browser/profiles/profile_browsertest.cc +++ b/src/chrome/browser/profiles/profile_browsertest.cc @@ -25,7 +25,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" -#include "chrome/test/base/ui_test_utils.h" +#include "content/public/test/test_utils.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -93,7 +93,7 @@ void SpinThreads() { class ProfileBrowserTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + void SetUpCommandLine(CommandLine* command_line) override { #if defined(OS_CHROMEOS) command_line->AppendSwitch( chromeos::switches::kIgnoreUserProfileMappingForTests);