Set --window-size and --disable-background-networking for CRC.

--window-size makes the tests more repeatable and comparable. The constrained
  window dimensions also let us scroll on more pages.
--disable-background-networking is set by the page cyclers and other perf tests
  in order to reduce variance due to checking for updates, etc.

BUG=None
TEST=None

Review URL: https://codereview.chromium.org/11077004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160877 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 9 deletions

diff --git a/tools/chrome_remote_control/chrome_remote_control/android_browser_backend.py b/tools/chrome_remote_control/chrome_remote_control/android_browser_backend.py
index 1d1df0d..19e03af 100644
--- a/tools/chrome_remote_control/chrome_remote_control/android_browser_backend.py
+++ b/tools/chrome_remote_control/chrome_remote_control/android_browser_backend.py
@@ -28,8 +28,7 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
       pseudo_exec_name = 'content_shell'
     else:
       pseudo_exec_name = 'chrome'
-    args = [pseudo_exec_name,
-            '--disable-fre', '--no-first-run']
+    args = [pseudo_exec_name, '--disable-fre']
 
     # Kill old browser.
     self._adb.KillAll(self._package)
@@ -50,6 +49,7 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
     if extra_browser_args:
       args.extend(extra_browser_args)
     args.extend(options.extra_browser_args)
+    args.extend(self._common_chrome_browser_args)
     with tempfile.NamedTemporaryFile() as f:
       def EscapeIfNeeded(arg):
         return arg.replace(' ', '" "')
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_backend.py b/tools/chrome_remote_control/chrome_remote_control/browser_backend.py
index d2ee53c..b727714 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_backend.py
+++ b/tools/chrome_remote_control/chrome_remote_control/browser_backend.py
@@ -16,6 +16,11 @@ class BrowserGoneException(Exception):
 class BrowserBackend(object):
   """A base class for broser backends. Provides basic functionality
   once a remote-debugger port has been established."""
+  _common_chrome_browser_args = [
+    '--disable-background-networking',
+    '--no-first-run',
+  ]
+
   def __init__(self, is_content_shell):
     self.is_content_shell = is_content_shell
     self._port = None
diff --git a/tools/chrome_remote_control/chrome_remote_control/cros_browser_backend.py b/tools/chrome_remote_control/chrome_remote_control/cros_browser_backend.py
index f9367bb..6eb8311 100644
--- a/tools/chrome_remote_control/chrome_remote_control/cros_browser_backend.py
+++ b/tools/chrome_remote_control/chrome_remote_control/cros_browser_backend.py
@@ -42,16 +42,16 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend):
     remote_port = self._cri.GetRemotePort()
 
     args = ['/opt/google/chrome/chrome',
-            '--no-first-run',
+            '--allow-webui-compositing',
             '--aura-host-window-use-fullscreen',
-            '--force-compositing-mode',
             '--enable-smooth-scrolling',
             '--enable-threaded-compositing',
             '--enable-per-tile-painting',
-            '--enable-gpu--sandboxing',
-            '--allow-webui-compositing',
+            '--enable-gpu-sandboxing',
             '--enable-accelerated-layers',
-            '--remote-debugging-port=%i' % remote_port]
+            '--force-compositing-mode',
+            '--remote-debugging-port=%i' % remote_port,
+            '--start-maximized']
 
     if not is_content_shell:
       logging.info('Preparing user data dir')
@@ -69,6 +69,7 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend):
     if extra_browser_args:
       args.extend(extra_browser_args)
     args.extend(options.extra_browser_args)
+    args.extend(self._common_chrome_browser_args)
     prevent_output = not options.show_stdout
 
     # Stop old X.
diff --git a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_backend.py b/tools/chrome_remote_control/chrome_remote_control/desktop_browser_backend.py
index 00b4264..fec87a2 100644
--- a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_backend.py
+++ b/tools/chrome_remote_control/chrome_remote_control/desktop_browser_backend.py
@@ -29,14 +29,15 @@ class DesktopBrowserBackend(browser_backend.BrowserBackend):
 
     self._port = DEFAULT_PORT
     args = [self._executable,
-            '--no-first-run',
-            '--remote-debugging-port=%i' % self._port]
+            '--remote-debugging-port=%i' % self._port,
+            '--window-size=1280,1024']
     if not options.dont_override_profile:
       self._tmpdir = tempfile.mkdtemp()
       args.append('--user-data-dir=%s' % self._tmpdir)
     if extra_browser_args:
       args.extend(extra_browser_args)
     args.extend(options.extra_browser_args)
+    args.extend(self._common_chrome_browser_args)
     if not options.show_stdout:
       self._devnull = open(os.devnull, 'w')
       self._proc = subprocess.Popen(