Remove temporary OS(ANDROID) for @viewport.

Source/core/css/resolver/ViewportStyleResolver.cpp

 /*
  * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 42 matching lines @@
     , m_hasAuthorStyle(false)
 {
     ASSERT(m_document);
 }
 
 void ViewportStyleResolver::collectViewportRules()
 {
     CSSDefaultStyleSheets& defaultStyleSheets = CSSDefaultStyleSheets::instance();
     collectViewportRules(defaultStyleSheets.defaultStyle(), UserAgentOrigin);
 
-    bool useMobileViewportStyle = m_document->settings() && m_document->settings()->useMobileViewportStyle();
-#if OS(ANDROID)
-    // FIXME: Remove when useMobileViewportStyle is set from chromium.
-    useMobileViewportStyle = true;
-#endif
-    if (useMobileViewportStyle)
+    if (m_document->settings() && m_document->settings()->useMobileViewportStyle())
         collectViewportRules(defaultStyleSheets.defaultMobileViewportStyle(), UserAgentOrigin);
 
     if (m_document->isMobileDocument())
         collectViewportRules(defaultStyleSheets.defaultXHTMLMobileProfileStyle(), UserAgentOrigin);
 
     if (ScopedStyleResolver* scopedResolver = m_document->scopedStyleResolver())
         scopedResolver->collectViewportRulesTo(this);
 
     resolve();
 }
@@ skipping 147 matching lines @@
     return result;
 }
 
 DEFINE_TRACE(ViewportStyleResolver)
 {
     visitor->trace(m_propertySet);
     visitor->trace(m_document);
 }
 
 } // namespace blink