~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to tests/unit-tests/frontend/test_session_mediator_android.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-03-10 19:28:46 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: package-import@ubuntu.com-20140310192846-rq9qm3ec26yrelo2
Tags: upstream-0.1.6+14.04.20140310
ImportĀ upstreamĀ versionĀ 0.1.6+14.04.20140310

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
#include "src/server/frontend/session_mediator.h"
21
21
#include "src/server/frontend/resource_cache.h"
22
22
#include "src/server/scene/application_session.h"
 
23
#include "src/server/report/null_report_factory.h"
23
24
#include "mir/frontend/shell.h"
24
25
#include "mir/shell/surface_creation_parameters.h"
25
26
#include "mir/graphics/display.h"
44
45
namespace mp = mir::protobuf;
45
46
namespace msh = mir::shell;
46
47
namespace mtd = mir::test::doubles;
 
48
namespace mr = mir::report;
47
49
 
48
50
namespace
49
51
{
55
57
          graphics_platform{std::make_shared<mtd::NullPlatform>()},
56
58
          display_changer{std::make_shared<mtd::NullDisplayChanger>()},
57
59
          surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
58
 
          report{std::make_shared<mf::NullSessionMediatorReport>()},
 
60
          report{mr::null_session_mediator_report()},
59
61
          resource_cache{std::make_shared<mf::ResourceCache>()},
60
62
          mediator{__LINE__, shell, graphics_platform, display_changer,
61
63
                   surface_pixel_formats, report,