Merge lp:~abreu-alexandre/oxide/limit-discardable-memory-19 into lp:oxide/1.9

[Alexandre Abreu]

Backport the limit discardable memory on mobile

[Chris Coulson (chrisccoulson)]

review: Approve

=== renamed file 'patches/add-limit-max-decoded-image-bytes-switch.patch' => 'patches/limit-max-decoded-image-bytes-on-mobile.patch'
--- patches/add-limit-max-decoded-image-bytes-switch.patch	2015-06-25 08:52:03 +0000
+++ patches/limit-max-decoded-image-bytes-on-mobile.patch	2015-09-29 13:54:38 +0000
@@ -3,14 +3,10 @@
 # Author: Chris Coulson <[e-mail]>
 
 diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
+index 1fbb0a5..43d3aa0 100644
 --- a/content/child/blink_platform_impl.cc
 +++ b/content/child/blink_platform_impl.cc
-@@ -5,16 +5,17 @@
- #include "content/child/blink_platform_impl.h"
- 
- #include <math.h>
- 
- #include <vector>
+@@ -10,6 +10,7 @@
  
  #include "base/allocator/allocator_extension.h"
  #include "base/bind.h"
@@ -18,17 +14,7 @@
  #include "base/files/file_path.h"
  #include "base/location.h"
  #include "base/memory/scoped_ptr.h"
- #include "base/memory/singleton.h"
- #include "base/metrics/histogram.h"
- #include "base/metrics/sparse_histogram.h"
- #include "base/process/process_metrics.h"
- #include "base/rand_util.h"
-@@ -54,16 +55,17 @@
- #include "content/child/web_discardable_memory_impl.h"
- #include "content/child/web_memory_dump_provider_adapter.h"
- #include "content/child/web_process_memory_dump_impl.h"
- #include "content/child/web_url_loader_impl.h"
- #include "content/child/web_url_request_util.h"
+@@ -59,6 +60,7 @@
  #include "content/child/websocket_bridge.h"
  #include "content/child/worker_task_runner.h"
  #include "content/public/common/content_client.h"
@@ -36,36 +22,19 @@
  #include "net/base/data_url.h"
  #include "net/base/ip_address_number.h"
  #include "net/base/net_errors.h"
- #include "net/base/net_util.h"
- #include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h"
- #include "third_party/WebKit/public/platform/WebData.h"
- #include "third_party/WebKit/public/platform/WebFloatPoint.h"
- #include "third_party/WebKit/public/platform/WebMemoryDumpProvider.h"
-@@ -1281,33 +1283,34 @@ bool BlinkPlatformImpl::memoryAllocatorW
- }
- 
- blink::WebDiscardableMemory*
- BlinkPlatformImpl::allocateAndLockDiscardableMemory(size_t bytes) {
-   return content::WebDiscardableMemoryImpl::CreateLockedMemory(bytes).release();
+@@ -1336,7 +1338,10 @@ BlinkPlatformImpl::allocateAndLockDiscardableMemory(size_t bytes) {
  }
  
  size_t BlinkPlatformImpl::maxDecodedImageBytes() {
 -#if defined(OS_ANDROID)
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+          switches::kLimitMaxDecodedImageBytes)) {
++  if (!GetContentClient()->ShouldOptimizeForMemoryUsage()) {
 +    return noDecodedImageByteLimit;
 +  }
 +
    if (base::SysInfo::IsLowEndDevice()) {
      // Limit image decoded size to 3M pixels on low end devices.
      // 4 is maximum number of bytes per pixel.
-     return 3 * 1024 * 1024 * 4;
-   }
-   // For other devices, limit decoded image size based on the amount of physical
-   // memory.
-   // In some cases all physical memory is not accessible by Chromium, as it can
-   // be reserved for direct use by certain hardware. Thus, we set the limit so
-   // that 1.6GB of reported physical memory on a 2GB device is enough to set the
+@@ -1350,9 +1355,6 @@ size_t BlinkPlatformImpl::maxDecodedImageBytes() {
    // limit at 16M pixels, which is a desirable value since 4K*4K is a relatively
    // common texture size.
    return base::SysInfo::AmountOfPhysicalMemory() / 25;
@@ -75,20 +44,10 @@
  }
  
  uint32_t BlinkPlatformImpl::getUniqueIdForProcess() {
-   // TODO(rickyz): Replace this with base::GetUniqueIdForProcess when that's
-   // ready.
-   return base::trace_event::TraceLog::GetInstance()->process_id();
- }
- 
 diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
 --- a/content/public/common/content_switches.cc
 +++ b/content/public/common/content_switches.cc
-@@ -560,16 +560,19 @@ const char kInProcessGPU[]              
- 
- // Overrides the timeout, in seconds, that a child process waits for a
- // connection from the browser before killing itself.
- const char kIPCConnectionTimeout[]          = "ipc-connection-timeout";
- 
+@@ -570,6 +570,9 @@ const char kIPCConnectionTimeout[]          = "ipc-connection-timeout";
  // Specifies the flags passed to JS engine
  const char kJavaScriptFlags[]               = "js-flags";
  
@@ -98,29 +57,27 @@
  // Load an NPAPI plugin from the specified path.
  const char kLoadPlugin[]                    = "load-plugin";
  
- // Logs GPU control list decisions when enforcing blacklist rules.
- const char kLogGpuControlListDecisions[]    = "log-gpu-control-list-decisions";
- 
- // Sets the minimum log level. Valid values are from 0 to 3:
- // INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
 diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
 --- a/content/public/common/content_switches.h
 +++ b/content/public/common/content_switches.h
-@@ -161,16 +161,17 @@ CONTENT_EXPORT extern const char kGpuSan
- CONTENT_EXPORT extern const char kGpuStartupDialog[];
- extern const char kGpuVendorID[];
+@@ -164,9 +164,10 @@ extern const char kGpuVendorID[];
  CONTENT_EXPORT extern const char kHostResolverRules[];
  CONTENT_EXPORT extern const char kIgnoreCertificateErrors[];
  CONTENT_EXPORT extern const char kIgnoreGpuBlacklist[];
- CONTENT_EXPORT extern const char kInProcessGPU[];
+-extern const char kInProcessGPU[];
++CONTENT_EXPORT extern const char kInProcessGPU[];
  CONTENT_EXPORT extern const char kIPCConnectionTimeout[];
  CONTENT_EXPORT extern const char kJavaScriptFlags[];
 +CONTENT_EXPORT extern const char kLimitMaxDecodedImageBytes[];
  extern const char kLoadPlugin[];
  CONTENT_EXPORT extern const char kLogGpuControlListDecisions[];
  CONTENT_EXPORT extern const char kLoggingLevel[];
- CONTENT_EXPORT extern const char kLogNetLog[];
- extern const char kLogPluginMessages[];
- CONTENT_EXPORT extern const char kMainFrameResizesAreOrientationChanges[];
- extern const char kMaxUntiledLayerHeight[];
- extern const char kMaxUntiledLayerWidth[];
+@@ -200,7 +201,7 @@ CONTENT_EXPORT extern const char kReduceSecurityForTesting[];
+ CONTENT_EXPORT extern const char kReducedReferrerGranularity[];
+ CONTENT_EXPORT extern const char kRegisterPepperPlugins[];
+ CONTENT_EXPORT extern const char kRemoteDebuggingPort[];
+-extern const char kRendererCmdPrefix[];
++CONTENT_EXPORT extern const char kRendererCmdPrefix[];
+ CONTENT_EXPORT extern const char kRendererProcess[];
+ CONTENT_EXPORT extern const char kRendererProcessLimit[];
+ CONTENT_EXPORT extern const char kRendererStartupDialog[];

=== modified file 'patches/series'
--- patches/series	2015-06-29 11:25:34 +0000
+++ patches/series	2015-09-29 13:54:38 +0000
@@ -21,7 +21,8 @@
 store-cache-stats-at-startup.patch
 export-content-switches.patch
 fix-non-x11-build.patch
-add-limit-max-decoded-image-bytes-switch.patch
+add-optimize-for-memory-to-content-client.patch
+limit-max-decoded-image-bytes-on-mobile.patch
 customize-gesture-fling-curve.patch
 mediahub-support.patch
 allow-os-override-for-gpu-manager.patch
@@ -34,3 +35,4 @@
 implement-webrtc-get-cpu-features-arm.patch
 enable-optional-neon-for-skia.patch
 add-suggested-filename-to-download-starting-resource-delegate.patch
+lower-limit-for-discardable-memory-on-mobile.patch
\ No newline at end of file

=== modified file 'shared/app/oxide_content_main_delegate.cc'
--- shared/app/oxide_content_main_delegate.cc	2015-06-12 07:39:38 +0000
+++ shared/app/oxide_content_main_delegate.cc	2015-09-29 13:54:38 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,9 @@
 
 #include "shared/browser/oxide_browser_process_main.h"
 #include "shared/browser/oxide_content_browser_client.h"
+#include "shared/common/oxide_constants.h"
 #include "shared/common/oxide_content_client.h"
+#include "shared/common/oxide_form_factor.h"
 #include "shared/common/oxide_paths.h"
 #include "shared/renderer/oxide_content_renderer_client.h"
 
@@ -43,6 +45,25 @@
 
 namespace oxide {
 
+namespace {
+
+FormFactor FormFactorHintFromCommandLine(base::CommandLine* command_line) {
+  std::string form_factor =
+      command_line->GetSwitchValueASCII(switches::kFormFactor);
+  if (form_factor == switches::kFormFactorDesktop) {
+    return FORM_FACTOR_DESKTOP;
+  } else if (form_factor == switches::kFormFactorTablet) {
+    return FORM_FACTOR_TABLET;
+  } else if (form_factor == switches::kFormFactorPhone) {
+    return FORM_FACTOR_PHONE;
+  }
+
+  NOTREACHED();
+  return FORM_FACTOR_DESKTOP;
+}
+
+}
+
 ContentMainDelegate::ContentMainDelegate(PlatformDelegate* delegate)
     : delegate_(delegate) {
   CHECK(delegate_);
@@ -55,6 +76,10 @@
   content::SetContentClient(content_client_.get());
   RegisterPathProvider();
 
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kProcessType)) {
+    InitFormFactorHint(FormFactorHintFromCommandLine(command_line));
+  }
   return false;
 }
 

=== modified file 'shared/browser/oxide_browser_process_main.cc'
--- shared/browser/oxide_browser_process_main.cc	2015-09-10 08:31:38 +0000
+++ shared/browser/oxide_browser_process_main.cc	2015-09-29 13:54:38 +0000
@@ -65,10 +65,11 @@
 #include "shared/app/oxide_platform_delegate.h"
 #include "shared/common/oxide_constants.h"
 #include "shared/common/oxide_content_client.h"
+#include "shared/common/oxide_form_factor.h"
 
 #include "oxide_android_properties.h"
 #include "oxide_browser_context.h"
-#include "oxide_form_factor.h"
+#include "oxide_form_factor_detection.h"
 #include "oxide_message_pump.h"
 #include "oxide_web_contents_unloader.h"
 
@@ -328,36 +329,17 @@
 }
 
 void AddFormFactorSpecificCommandLineArguments() {
+  if (GetFormFactorHint() == FORM_FACTOR_DESKTOP) {
+    return;
+  }
+
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-
-  FormFactor form_factor = GetFormFactorHint();
-
-  if (form_factor != FORM_FACTOR_DESKTOP) {
-    command_line->AppendSwitch(switches::kEnableViewport);
-    command_line->AppendSwitch(switches::kEnableViewportMeta);
-    command_line->AppendSwitch(switches::kMainFrameResizesAreOrientationChanges);
-    command_line->AppendSwitch(switches::kEnablePinch);
-    // Note, overlay scrollbars do not work properly on desktop yet
-    // see https://launchpad.net/bugs/1426567
-    command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
-    command_line->AppendSwitch(switches::kLimitMaxDecodedImageBytes);
-  }
-
-  const char* form_factor_string = nullptr;
-  switch (form_factor) {
-    case FORM_FACTOR_DESKTOP:
-      form_factor_string = switches::kFormFactorDesktop;
-      break;
-    case FORM_FACTOR_TABLET:
-      form_factor_string = switches::kFormFactorTablet;
-      break;
-    case FORM_FACTOR_PHONE:
-      form_factor_string = switches::kFormFactorPhone;
-      break;
-    default:
-      NOTREACHED();
-  }
-  command_line->AppendSwitchASCII(switches::kFormFactor, form_factor_string);
+  command_line->AppendSwitch(switches::kEnableViewport);
+  command_line->AppendSwitch(switches::kMainFrameResizesAreOrientationChanges);
+  command_line->AppendSwitch(switches::kEnablePinch);
+  // Note, overlay scrollbars do not work properly on desktop yet
+  // see https://launchpad.net/bugs/1426567
+  command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
 }
 
 bool IsUnsupportedProcessModel(ProcessModel process_model) {
@@ -372,6 +354,20 @@
   }
 }
 
+const char* GetFormFactorHintCommandLine(FormFactor form_factor) {
+  switch (form_factor) {
+    case FORM_FACTOR_DESKTOP:
+      return switches::kFormFactorDesktop;
+    case FORM_FACTOR_TABLET:
+      return switches::kFormFactorTablet;
+    case FORM_FACTOR_PHONE:
+      return switches::kFormFactorPhone;
+  }
+
+  NOTREACHED();
+  return nullptr;
+}
+
 }
 
 BrowserProcessMainImpl::BrowserProcessMainImpl()
@@ -431,6 +427,19 @@
       base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kSingleProcess));
 
+  // Ideally we'd do this before calling
+  // ContentMainDelegate::BasicStartupComplete, and then ContentMainDelegate
+  // would call InitFormFactorHint for all process types. However,
+  // DetectFormFactorHint depends on BrowserPlatformIntegration, which is
+  // initialized when ContentBrowserClient is created. Perhaps we could create
+  // BPI earlier?
+  FormFactor form_factor = DetectFormFactorHint();
+  base::CommandLine::ForCurrentProcess()
+      ->AppendSwitchASCII(switches::kFormFactor,
+                          GetFormFactorHintCommandLine(form_factor));
+
+  InitFormFactorHint(form_factor);
+
   AddFormFactorSpecificCommandLineArguments();
 
 #if defined(USE_NSS_CERTS)

=== modified file 'shared/browser/oxide_content_browser_client.cc'
--- shared/browser/oxide_content_browser_client.cc	2015-06-29 22:44:52 +0000
+++ shared/browser/oxide_content_browser_client.cc	2015-09-29 13:54:38 +0000
@@ -37,6 +37,7 @@
 #include "shared/browser/media/oxide_media_capture_devices_dispatcher.h"
 #include "shared/common/oxide_constants.h"
 #include "shared/common/oxide_content_client.h"
+#include "shared/common/oxide_form_factor.h"
 
 #include "oxide_access_token_store.h"
 #include "oxide_android_properties.h"
@@ -44,7 +45,6 @@
 #include "oxide_browser_main_parts.h"
 #include "oxide_browser_platform_integration.h"
 #include "oxide_browser_process_main.h"
-#include "oxide_form_factor.h"
 #include "oxide_quota_permission_context.h"
 #include "oxide_render_message_filter.h"
 #include "oxide_resource_dispatcher_host_delegate.h"
@@ -105,9 +105,8 @@
   // This can be called on the UI or IO thread
   static const char* const kSwitchNames[] = {
     switches::kEnableGoogleTalkPlugin,
+    switches::kEnableMediaHubAudio,
     switches::kFormFactor,
-    switches::kLimitMaxDecodedImageBytes,
-    switches::kEnableMediaHubAudio,
     switches::kMediaHubFixedSessionDomains
   };
   command_line->CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),

=== renamed file 'shared/browser/oxide_form_factor_linux.cc' => 'shared/browser/oxide_form_factor_detection_linux.cc'
--- shared/browser/oxide_form_factor_linux.cc	2015-01-21 22:58:10 +0000
+++ shared/browser/oxide_form_factor_detection_linux.cc	2015-09-29 13:54:38 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2014 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,47 +15,20 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include "oxide_form_factor.h"
+#include "oxide_form_factor_detection.h"
 
 #include <algorithm>
 
-#include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 
+#include "shared/common/oxide_form_factor.h"
+
 #include "oxide_android_properties.h"
 #include "oxide_browser_platform_integration.h"
 
 namespace oxide {
 
-FormFactor GetFormFactorHint() {
-  static bool initialized = false;
-  static FormFactor form_factor = FORM_FACTOR_DESKTOP;
-
-  if (initialized) {
-    return form_factor;
-  }
-
-  const char* force = getenv("OXIDE_FORCE_FORM_FACTOR");
-  if (force) {
-    initialized = true;
-    if (!strcmp(force, "desktop")) {
-      form_factor = FORM_FACTOR_DESKTOP;
-    } else if (!strcmp(force, "tablet")) {
-      form_factor = FORM_FACTOR_TABLET;
-    } else if (!strcmp(force, "phone")) {
-      form_factor = FORM_FACTOR_PHONE;
-    } else {
-      LOG(ERROR) << "Unrecognized value for OXIDE_FORCE_FORM_FACTOR";
-      initialized = false;
-    }
-  }
-
-  if (initialized) {
-    return form_factor;
-  }
-
-  initialized = true;
-
+FormFactor DetectFormFactorHintImpl() {
   if (AndroidProperties::GetInstance()->Available()) {
     // Ubuntu on phones and tablets currently uses an Android kernel and EGL
     // stack. If we detect these, assume we are a phone or tablet. The screen
@@ -65,17 +38,17 @@
         BrowserPlatformIntegration::GetInstance()->GetDefaultScreenInfo());
     if (std::min(screen.rect.width / screen.deviceScaleFactor,
                  screen.rect.height / screen.deviceScaleFactor) >= 600) {
-      form_factor = FORM_FACTOR_TABLET;
-    } else {
-      form_factor = FORM_FACTOR_PHONE;
+      return FORM_FACTOR_TABLET;
     }
-  } else {
-    // If this is not an Ubuntu phone or tablet, assume desktop linux for now.
-    // We could be cleverer here, eg, using /sys/class/dmi/id/chassis_type
-    // or something like that. But this is good enough for now
+
+    return FORM_FACTOR_PHONE;
   }
 
-  return form_factor;
+  // If this is not an Ubuntu phone or tablet, assume desktop linux for now.
+  // We could be cleverer here, eg, using /sys/class/dmi/id/chassis_type
+  // or something like that. But this is good enough for now
+
+  return FORM_FACTOR_DESKTOP;
 }
 
 } // namespace oxide

=== modified file 'shared/browser/oxide_power_save_blocker.cc'
--- shared/browser/oxide_power_save_blocker.cc	2015-07-22 04:33:55 +0000
+++ shared/browser/oxide_power_save_blocker.cc	2015-09-29 13:54:38 +0000
@@ -29,11 +29,11 @@
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
+#include "shared/common/oxide_form_factor.h"
 #include "shared/port/content/browser/power_save_blocker_oxide.h"
 
 #include "oxide_browser_platform_integration.h"
 #include "oxide_browser_platform_integration_observer.h"
-#include "oxide_form_factor.h"
 
 namespace oxide {
 

=== modified file 'shared/browser/oxide_renderer_frame_evictor.cc'
--- shared/browser/oxide_renderer_frame_evictor.cc	2014-06-24 00:33:34 +0000
+++ shared/browser/oxide_renderer_frame_evictor.cc	2015-09-29 13:54:38 +0000
@@ -23,7 +23,8 @@
 #include "base/sys_info.h"
 #include "content/common/host_shared_bitmap_manager.h"
 
-#include "oxide_form_factor.h"
+#include "shared/common/oxide_form_factor.h"
+
 #include "oxide_renderer_frame_evictor_client.h"
 
 namespace oxide {

=== modified file 'shared/common/oxide_content_client.cc'
--- shared/common/oxide_content_client.cc	2015-04-09 22:20:49 +0000
+++ shared/common/oxide_content_client.cc	2015-09-29 13:54:38 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -27,6 +27,7 @@
 #include "shared/browser/oxide_content_browser_client.h"
 #include "shared/renderer/oxide_content_renderer_client.h"
 
+#include "oxide_form_factor.h"
 #include "oxide_user_agent.h"
 
 namespace oxide {
@@ -55,7 +56,16 @@
 
 base::RefCountedStaticMemory* ContentClient::GetDataResourceBytes(
     int resource_id) const {
-  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+      resource_id);
+}
+
+bool ContentClient::ShouldOptimizeForMemoryUsage() const {
+  if (GetFormFactorHint() == FORM_FACTOR_DESKTOP) {
+    return false;
+  }
+
+  return true;
 }
 
 // static

=== modified file 'shared/common/oxide_content_client.h'
--- shared/common/oxide_content_client.h	2014-11-08 01:06:30 +0000
+++ shared/common/oxide_content_client.h	2015-09-29 13:54:38 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,6 +47,7 @@
                                     ui::ScaleFactor scale_factor) const final;
   base::RefCountedStaticMemory* GetDataResourceBytes(
       int resource_id) const final;
+  bool ShouldOptimizeForMemoryUsage() const final;
 
   DISALLOW_COPY_AND_ASSIGN(ContentClient);
 };

=== renamed file 'shared/browser/oxide_form_factor.h' => 'shared/common/oxide_form_factor.h'
--- shared/browser/oxide_form_factor.h	2014-02-13 16:04:31 +0000
+++ shared/common/oxide_form_factor.h	2015-09-29 13:54:38 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef _OXIDE_SHARED_BROWSER_FORM_FACTOR_H_
-#define _OXIDE_SHARED_BROWSER_FORM_FACTOR_H_
+#ifndef _OXIDE_SHARED_COMMON_FORM_FACTOR_H_
+#define _OXIDE_SHARED_COMMON_FORM_FACTOR_H_
 
 namespace oxide {
 
@@ -26,8 +26,10 @@
   FORM_FACTOR_PHONE
 };
 
+void InitFormFactorHint(FormFactor form_factor);
+
 FormFactor GetFormFactorHint();
 
 }
 
-#endif // _OXIDE_SHARED_BROWSER_FORM_FACTOR_H_
+#endif // _OXIDE_SHARED_COMMON_FORM_FACTOR_H_

=== modified file 'shared/renderer/oxide_content_renderer_client.cc'
--- shared/renderer/oxide_content_renderer_client.cc	2015-06-29 16:47:46 +0000
+++ shared/renderer/oxide_content_renderer_client.cc	2015-09-29 13:54:38 +0000
@@ -35,6 +35,7 @@
 
 #include "shared/common/chrome_version.h"
 #include "shared/common/oxide_constants.h"
+#include "shared/common/oxide_form_factor.h"
 #include "shared/common/oxide_net_resource_provider.h"
 
 #include "oxide_renderer_user_agent_settings.h"
@@ -85,11 +86,8 @@
   blink::WebSettings* settings = render_view->GetWebView()->settings();
   settings->setDoubleTapToZoomEnabled(true); // XXX: Make this configurable
 
-  std::string form_factor =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-        switches::kFormFactor);
-  if (form_factor == switches::kFormFactorTablet ||
-      form_factor == switches::kFormFactorPhone) {
+  if (GetFormFactorHint() == FORM_FACTOR_TABLET ||
+      GetFormFactorHint() == FORM_FACTOR_PHONE) {
     settings->setAllowCustomScrollbarInMainFrame(false);
     settings->setUseWideViewport(true);
     settings->setMainFrameClipsContent(false);

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2015-07-01 09:56:23 +0000
+++ shared/shared.gyp	2015-09-29 13:54:38 +0000
@@ -341,8 +341,9 @@
         'browser/oxide_event_utils.h',
         'browser/oxide_file_picker.cc',
         'browser/oxide_file_picker.h',
-        'browser/oxide_form_factor.h',
-        'browser/oxide_form_factor_linux.cc',
+        'browser/oxide_form_factor_detection.cc',
+        'browser/oxide_form_factor_detection.h',
+        'browser/oxide_form_factor_detection_linux.cc',
         'browser/oxide_gesture_provider.cc',
         'browser/oxide_gesture_provider.h',
         'browser/oxide_gpu_info_collector_linux.cc',
@@ -448,6 +449,8 @@
         'common/oxide_export.h',
         'common/oxide_file_utils.cc',
         'common/oxide_file_utils.h',
+        'common/oxide_form_factor.cc',
+        'common/oxide_form_factor.h',
         'common/oxide_id_allocator.cc',
         'common/oxide_id_allocator.h',
         'common/oxide_message_enums.h',