Reworked the plumbing required to pass the client resolution to the desktop resizer.

remoting/host/resizing_host_observer_unittest.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 <list>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "remoting/host/desktop_resizer.h"
 #include "remoting/host/resizing_host_observer.h"
+#include "remoting/host/screen_resolution.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 std::ostream& operator<<(std::ostream& os, const SkISize& size) {
   return os << size.width() << "x" << size.height();
 }
 
+const int kDefaultDPI = 96;

[Jamie, 2013/03/15 22:06:27]

Anonymous namespace?

[alexeypa (please no reviews), 2013/03/15 22:32:12]

Not needed. See my previous comment.

+
 namespace remoting {
 
 class FakeDesktopResizer : public DesktopResizer {
  public:
   FakeDesktopResizer(const SkISize& initial_size, bool exact_size_supported,
                      const SkISize* supported_sizes, int num_supported_sizes)
       : initial_size_(initial_size),
         current_size_(initial_size),
         exact_size_supported_(exact_size_supported),
         set_size_call_count_(0) {
@@ skipping 44 matching lines @@
 
   void SetDesktopResizer(scoped_ptr<FakeDesktopResizer> desktop_resizer) {
     CHECK(!desktop_resizer_) << "Call SetDeskopResizer once per test";
     desktop_resizer_ = desktop_resizer.get();
 
     resizing_host_observer_.reset(
         new ResizingHostObserver(desktop_resizer.PassAs<DesktopResizer>()));
   }
 
   SkISize GetBestSize(const SkISize& client_size) {
-    resizing_host_observer_->OnClientResolutionChanged(SkIPoint(), client_size);
+    resizing_host_observer_->SetScreenResolution(ScreenResolution(
+        client_size, SkIPoint::Make(kDefaultDPI, kDefaultDPI)));
     return desktop_resizer_->GetCurrentSize();
   }
 
   void VerifySizes(const SkISize* client_sizes, const SkISize* expected_sizes,
                    int number_of_sizes) {
     for (int i = 0; i < number_of_sizes; ++i) {
       SkISize best_size = GetBestSize(client_sizes[i]);
       EXPECT_EQ(expected_sizes[i], best_size)
           << "Input size = " << client_sizes[i];
     }
@@ skipping 86 matching lines @@
                              supported_sizes, arraysize(supported_sizes));
   SetDesktopResizer(scoped_ptr<FakeDesktopResizer>(desktop_resizer));
 
   SkISize client_sizes[] = { { 640, 640 }, { 1024, 768 }, { 640, 480 } };
   SkISize expected_sizes[] = { { 640, 480 }, { 640, 480 }, { 640, 480 } };
   VerifySizes(client_sizes, expected_sizes, arraysize(client_sizes));
   EXPECT_EQ(desktop_resizer->set_size_call_count(), 0);
 }
 
 }  // namespace remoting