Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / location_bar / location_bar_browsertest.cc

diff --git a/src/chrome/browser/ui/location_bar/location_bar_browsertest.cc b/src/chrome/browser/ui/location_bar/location_bar_browsertest.cc
index feb3321..f972f50 100644 (file)
--- a/src/chrome/browser/ui/location_bar/location_bar_browsertest.cc
+++ b/src/chrome/browser/ui/location_bar/location_bar_browsertest.cc
@@ -43,10 +43,10 @@ const char kManifestSource[] =
 class LocationBarBrowserTest : public ExtensionBrowserTest {
  public:
   LocationBarBrowserTest() {}
-  virtual ~LocationBarBrowserTest() {}
+  ~LocationBarBrowserTest() override {}
 
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // Load an extension with a PageAction that sends a message when clicked.
   const extensions::Extension* LoadPageActionExtension(
@@ -84,13 +84,7 @@ const extensions::Extension* LocationBarBrowserTest::LoadPageActionExtension(
 // page action logic is more fully tested as part of the extensions system, this
 // only needs to check that they are displayed and clicking on them triggers
 // the action.
-// TODO(devlin): This flakily times out on Mac. crbug.com/410866
-#if defined(OS_MACOSX)
-#define MAYBE_PageActionUITest DISABLED_PageActionUITeset
-#else
-#define MAYBE_PageActionUITest PageActionUITest
-#endif
-IN_PROC_BROWSER_TEST_F(LocationBarBrowserTest, MAYBE_PageActionUITest) {
+IN_PROC_BROWSER_TEST_F(LocationBarBrowserTest, PageActionUITest) {
   LocationBarTesting* location_bar =
       browser()->window()->GetLocationBar()->GetLocationBarForTesting();
 
@@ -167,10 +161,10 @@ IN_PROC_BROWSER_TEST_F(LocationBarBrowserTest,
 class LocationBarBrowserTestWithRedesign : public LocationBarBrowserTest {
  public:
   LocationBarBrowserTestWithRedesign() {}
-  virtual ~LocationBarBrowserTestWithRedesign() {}
+  ~LocationBarBrowserTestWithRedesign() override {}
 
  private:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 
   scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;