X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fextensions%2Fapi%2Fstorage%2Fsettings_apitest.cc;h=2a3120f7937148cad2dc33ead4d280f4aa011243;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=1a14f39a6fd7a6cf681cadfdcbe33a50db58b9c6;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/extensions/api/storage/settings_apitest.cc b/src/chrome/browser/extensions/api/storage/settings_apitest.cc index 1a14f39..2a3120f 100644 --- a/src/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/src/chrome/browser/extensions/api/storage/settings_apitest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/test/base/ui_test_utils.h" #include "extensions/browser/api/storage/settings_namespace.h" #include "extensions/browser/api/storage/storage_frontend.h" #include "extensions/browser/extension_system.h" @@ -25,6 +24,7 @@ #include "sync/api/sync_change_processor_wrapper_for_test.h" #include "sync/api/sync_error_factory.h" #include "sync/api/sync_error_factory_mock.h" +#include "sync/api/syncable_service.h" #include "testing/gmock/include/gmock/gmock.h" #if defined(ENABLE_CONFIGURATION_POLICY) @@ -74,7 +74,7 @@ class MockSchemaRegistryObserver : public policy::SchemaRegistry::Observer { class ExtensionSettingsApiTest : public ExtensionApiTest { protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); #if defined(ENABLE_CONFIGURATION_POLICY)