[Remoting Android] DisplayUpdaterFactory cleanups

remoting/client/plugin/chromoting_instance.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 "remoting/client/plugin/chromoting_instance.h"
 
 #include <nacl_io/nacl_io.h>
 #include <sys/mount.h>
 
 #include <string>
@@ skipping 615 matching lines @@
     normalizing_input_filter_.reset(
         new NormalizingInputFilterWin(&key_mapper_));
   } else {
     DCHECK(key_filter.empty());
     normalizing_input_filter_.reset(new protocol::InputFilter(&key_mapper_));
   }
   input_tracker_.set_input_stub(normalizing_input_filter_.get());
 
   // Try initializing 3D video renderer.
   video_renderer_.reset(new PepperVideoRenderer3D());
-  if (!video_renderer_->Initialize(this, context_, this, &perf_tracker_))
+  video_renderer_->SetPepperContext(this, this);
+  if (!video_renderer_->Initialize(context_, &perf_tracker_)) {
     video_renderer_.reset();
+  }
 
   // If we didn't initialize 3D renderer then use the 2D renderer.
   if (!video_renderer_) {
     LOG(WARNING)
         << "Failed to initialize 3D renderer. Using 2D renderer instead.";
     video_renderer_.reset(new PepperVideoRenderer2D());
-    if (!video_renderer_->Initialize(this, context_, this, &perf_tracker_))
+    video_renderer_->SetPepperContext(this, this);
+    if (!video_renderer_->Initialize(context_, &perf_tracker_)) {
       video_renderer_.reset();
+    }
   }
 
   CHECK(video_renderer_);
 
   perf_tracker_.SetUpdateUmaCallbacks(
       base::Bind(&ChromotingInstance::UpdateUmaCustomHistogram,
                  weak_factory_.GetWeakPtr(), true),
       base::Bind(&ChromotingInstance::UpdateUmaCustomHistogram,
                  weak_factory_.GetWeakPtr(), false),
       base::Bind(&ChromotingInstance::UpdateUmaEnumHistogram,
@@ skipping 466 matching lines @@
   if (is_custom_counts_histogram) {
     uma.HistogramCustomCounts(histogram_name, value, histogram_min,
                               histogram_max, histogram_buckets);
   } else {
     uma.HistogramCustomTimes(histogram_name, value, histogram_min,
                              histogram_max, histogram_buckets);
   }
 }
 
 }  // namespace remoting