Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / activity_log / activity_log_browsertest.cc

diff --git a/src/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/src/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
index 32a175e..664a9d0 100644 (file)
--- a/src/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
+++ b/src/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
@@ -11,12 +11,12 @@
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
@@ -29,7 +29,7 @@ namespace extensions {
 class ActivityLogPrerenderTest : public ExtensionApiTest {
  protected:
   // Make sure the activity log is turned on.
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  void SetUpCommandLine(CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExtensionActivityLogging);
     command_line->AppendSwitchASCII(switches::kPrerenderMode,