Revert of Support device scale factor test with popups in LayoutTest

Revert of Support device scale factor test with popups in LayoutTest (patchset #2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server. Skip all "dfs2" in TextExpectations, add
FIXME notes.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
>
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
>
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
>
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromium.org,oshima@chromium.org
BUG=567837, 570401
Committed: https://crrev.com/8ab1ead46c6add1bc2afe0d4ea969841bd15f35f
Cr-Commit-Position: refs/heads/master@{#366318}

[Noel Gordon, 2015-12-20 23:58:56]

Created Revert of Support device scale factor test with popups in LayoutTest

[commit-bot: I haz the power, 2015-12-20 23:58:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1541713002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1541713002/1

[Noel Gordon, 2015-12-20 23:59:15]

Description was changed from

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=567837
==========

to

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=567837, 570401
==========

[commit-bot: I haz the power, 2015-12-20 23:59:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-20 23:59:28]

Failed to apply patch for content/shell/browser/shell.cc:
While running git apply --index -3 -p1;
  error: patch failed: content/shell/browser/shell.cc:35
  Falling back to three-way merge...
  Applied patch to 'content/shell/browser/shell.cc' with conflicts.
  U content/shell/browser/shell.cc

Patch:       content/shell/browser/shell.cc
Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index
de632720474d515549a59a47d3108707c486f457..12fde0b981f9818af5e2e58520567335a75aaf31
100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -18,7 +18,6 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
-#include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_switches.h"
@@ -35,12 +34,6 @@
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/switches.h"
-
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-#include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
-#endif
 
 namespace content {
 
@@ -390,19 +383,6 @@
   return PlatformHandleContextMenu(params);
 }
 
-void Shell::SetDeviceScaleFactor(float scale) {
-#if !defined(OS_CHROMEOS)
-  gfx::Display::ResetForceDeviceScaleFactorForTesting();
-  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kForceDeviceScaleFactor, base::StringPrintf("%f", scale));
-#if defined(USE_X11)
-  views::DesktopScreenX11::UpdateDeviceScaleFactorForTest();
-#endif
-#endif
-  RenderWidgetHostView* host_view = web_contents_->GetRenderWidgetHostView();
-  host_view->SetSize(host_view->GetViewBounds().size());
-}
-
 gfx::Size Shell::GetShellDefaultSize() {
   static gfx::Size default_shell_size;
   if (!default_shell_size.IsEmpty())

[commit-bot: I haz the power, 2015-12-20 23:59:31]

The CQ bit was unchecked by commit-bot@chromium.org

[Noel Gordon, 2015-12-20 23:59:37]

Description was changed from

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=567837, 570401
==========

to

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=567837, 570401
==========

[Noel Gordon, 2015-12-21 00:15:45]

Will try by hand then.

[Noel Gordon, 2015-12-21 00:17:05]

Description was changed from

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=567837, 570401
==========

to

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
BUG=567837, 570401
==========

[Noel Gordon, 2015-12-21 00:43:49]

The CQ bit was checked by noel@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-12-21 00:44:03]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1541713002/280001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1541713002/280001

[Noel Gordon, 2015-12-21 00:45:17]

Description was changed from

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
BUG=567837, 570401
==========

to

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server. Skip all "dfs2" in TextExpectations, add
FIXME notes.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
BUG=567837, 570401
==========

[commit-bot: I haz the power, 2015-12-21 01:39:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-21 01:39:08]

Dry run: This issue passed the CQ dry run.

[Noel Gordon, 2015-12-21 01:39:46]

The CQ bit was checked by noel@chromium.org

[commit-bot: I haz the power, 2015-12-21 01:39:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1541713002/280001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1541713002/280001

[commit-bot: I haz the power, 2015-12-21 01:44:08]

Description was changed from

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server. Skip all "dfs2" in TextExpectations, add
FIXME notes.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
BUG=567837, 570401
==========

to

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server. Skip all "dfs2" in TextExpectations, add
FIXME notes.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
BUG=567837, 570401
==========

[commit-bot: I haz the power, 2015-12-21 01:44:09]

Committed patchset #3 (id:280001)

[commit-bot: I haz the power, 2015-12-21 01:45:11]

Description was changed from

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server. Skip all "dfs2" in TextExpectations, add
FIXME notes.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
> 
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
> 
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
> 
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
BUG=567837, 570401
==========

to

==========
Revert of Support device scale factor test with popups in LayoutTest (patchset
#2 id:40001 of https://codereview.chromium.org/1525933002/ )

Reason for revert:
Looking into http://crbug.com/570401 where the auto-rebaseline server
seems to be generating some baselines with a root layer size of 1600x1200
rather than 800x600, or is producing all white image results. It started
around the time this change went in.  Reverting here to attempt to
restore the rebaseline server. Skip all "dfs2" in TextExpectations, add
FIXME notes.

Original issue's description:
> Support device scale factor test with popups in LayoutTest
>
> * Sends DSF to host so that host can send a resize request with requested DSF.
> * Updated X11's screen so that displays contains specified DSF.
>   This is used by RWH to construct WebScreenInfo with updated DSF.
>   - Win/Mac will use the DSF specified by command line flag.
> * Scale the popup location based on the device scale factor.
>   This is done by compositor in normal scenario.
>
> BUG=567837
> TEST=added popu-menu-appearance-dsf2.html
>
> Committed: https://crrev.com/76ebe14aeee04f02c62273c638e110f621c162aa
> Cr-Commit-Position: refs/heads/master@{#365647}

TBR=mkwst@chromium.org,sadrul@chromium.org,tkent@chromium.org,wkorman@chromiu...
BUG=567837, 570401

Committed: https://crrev.com/8ab1ead46c6add1bc2afe0d4ea969841bd15f35f
Cr-Commit-Position: refs/heads/master@{#366318}
==========

[commit-bot: I haz the power, 2015-12-21 01:45:12]

Patchset 3 (id:??) landed as
https://crrev.com/8ab1ead46c6add1bc2afe0d4ea969841bd15f35f
Cr-Commit-Position: refs/heads/master@{#366318}