Add context to gfx::Screen calls in support of simultaneous desktop+ash

chrome/browser/metrics/metrics_log.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 "chrome/browser/metrics/metrics_log.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 326 matching lines @@
 
     WritePluginStabilityElements(plugin_list, pref);
   }
 }
 
 PrefService* MetricsLog::GetPrefService() {
   return g_browser_process->local_state();
 }
 
 gfx::Size MetricsLog::GetScreenSize() const {
-  return gfx::Screen::GetPrimaryDisplay().GetSizeInPixel();
+  return gfx::Screen::GetPrimaryDisplay(
+      gfx::Screen::BadTwoWorldsContext()).GetSizeInPixel();
 }
 
 float MetricsLog::GetScreenDeviceScaleFactor() const {
-  return gfx::Screen::GetPrimaryDisplay().device_scale_factor();
+  return gfx::Screen::GetPrimaryDisplay(
+      gfx::Screen::BadTwoWorldsContext()).device_scale_factor();
 }
 
 int MetricsLog::GetScreenCount() const {
-  return gfx::Screen::GetNumDisplays();
+  return gfx::Screen::GetNumDisplays(gfx::Screen::BadTwoWorldsContext());
 }
 
 void MetricsLog::GetFieldTrialIds(
     std::vector<SelectedGroupId>* field_trial_ids) const {
   chrome_variations::GetFieldTrialSelectedGroupIds(field_trial_ids);
 }
 
 void MetricsLog::WriteStabilityElement(
     const std::vector<webkit::WebPluginInfo>& plugin_list,
     PrefService* pref) {
@@ skipping 643 matching lines @@
     ProductDataToProto(google_update_metrics.google_update_data,
                        google_update->mutable_google_update_status());
   }
 
   if (!google_update_metrics.product_data.version.empty()) {
     ProductDataToProto(google_update_metrics.product_data,
                        google_update->mutable_client_status());
   }
 #endif  // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
 }