| Index: content/test/test_content_client.h
|
| diff --git a/content/test/test_content_client.h b/content/test/test_content_client.h
|
| index 94fb82078f919c4678c52d09af8fc1c547deafd7..ecf449bc9d8c9370c84f783357d40c6796fc8fcd 100644
|
| --- a/content/test/test_content_client.h
|
| +++ b/content/test/test_content_client.h
|
| @@ -32,9 +32,9 @@ class TestContentClient : public content::ContentClient {
|
| virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
|
| virtual std::string GetUserAgent() const OVERRIDE;
|
| virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
|
| - virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE;
|
| - virtual base::StringPiece GetImageResource(int resource_id,
|
| - float scale_factor) const OVERRIDE;
|
| + virtual base::StringPiece GetDataResource(
|
| + int resource_id,
|
| + ui::ScaleFactor scale_factor) const OVERRIDE;
|
| #if defined(OS_WIN)
|
| virtual bool SandboxPlugin(CommandLine* command_line,
|
| sandbox::TargetPolicy* policy) OVERRIDE;
|
|
|