[Android] Fixes app crash when using both enable and disable delegated renderer command line switch.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 80 matching lines @@
     scoped_ptr<cc::SingleReleaseCallback> release_callback,
     scoped_ptr<SkBitmap> bitmap,
     scoped_ptr<SkAutoLockPixels> bitmap_pixels_lock,
     bool result) {
   bitmap_pixels_lock.reset();
   release_callback->Run(0, false);
   callback.Run(result, *bitmap);
 }
 
 bool UsingDelegatedRenderer() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableDelegatedRenderer);
+  // TODO(vivekg): |using_delegated_renderer| should be set to "true"

[aelias_OOO_until_Jul13, 2014/01/07 20:02:57]

Please remove this TODO.  We usually add flags to
content/browser/android/content_startup_flags.cc for this kind of thing.

+  // once we enable delegated renderer as default on Android.
+  // crbug.com/208551
+  bool using_delegated_renderer = false;
+
+  using_delegated_renderer |= CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableDelegatedRenderer);
+
+  using_delegated_renderer &= !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableDelegatedRenderer);
+
+  return using_delegated_renderer;
 }
 
 }  // anonymous namespace
 
 RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
     RenderWidgetHostImpl* widget_host,
     ContentViewCoreImpl* content_view_core)
     : host_(widget_host),
       needs_begin_frame_(false),
       are_layers_attached_(!widget_host->is_hidden()),
@@ skipping 1294 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content