Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(594)

Side by Side Diff: athena/content/content_proxy_browsertest.cc

Issue 677233002: Fixing trybot failure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/activity/public/activity.h" 5 #include "athena/activity/public/activity.h"
6 #include "athena/activity/public/activity_view_model.h" 6 #include "athena/activity/public/activity_view_model.h"
7 #include "athena/resource_manager/public/resource_manager.h" 7 #include "athena/resource_manager/public/resource_manager.h"
8 #include "athena/test/chrome/athena_browsertest.h" 8 #include "athena/test/chrome/athena_browsertest.h"
9 #include "athena/test/chrome/test_util.h" 9 #include "athena/test/chrome/test_util.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 10 matching lines...) Expand all
21 const char kTestUrl[] = "chrome:about"; 21 const char kTestUrl[] = "chrome:about";
22 } 22 }
23 23
24 // Need to override the test class to make the test always draw its content. 24 // Need to override the test class to make the test always draw its content.
25 class ContentProxyBrowserTest : public AthenaBrowserTest { 25 class ContentProxyBrowserTest : public AthenaBrowserTest {
26 public: 26 public:
27 ContentProxyBrowserTest() {} 27 ContentProxyBrowserTest() {}
28 ~ContentProxyBrowserTest() override {} 28 ~ContentProxyBrowserTest() override {}
29 29
30 // AthenaBrowserTest: 30 // AthenaBrowserTest:
31 void SetUpCommandLine(CommandLine* command_line) override { 31 void SetUpCommandLine(base::CommandLine* command_line) override {
32 // Make sure that we draw the output - it's required for this test. 32 // Make sure that we draw the output - it's required for this test.
33 command_line->AppendSwitch(switches::kEnablePixelOutputInTests); 33 command_line->AppendSwitch(switches::kEnablePixelOutputInTests);
34 AthenaBrowserTest::SetUpCommandLine(command_line); 34 AthenaBrowserTest::SetUpCommandLine(command_line);
35 } 35 }
36 36
37 private: 37 private:
38 DISALLOW_COPY_AND_ASSIGN(ContentProxyBrowserTest); 38 DISALLOW_COPY_AND_ASSIGN(ContentProxyBrowserTest);
39 }; 39 };
40 40
41 IN_PROC_BROWSER_TEST_F(ContentProxyBrowserTest, CreateContent) { 41 IN_PROC_BROWSER_TEST_F(ContentProxyBrowserTest, CreateContent) {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 activity1->SetCurrentState(Activity::ACTIVITY_VISIBLE); 108 activity1->SetCurrentState(Activity::ACTIVITY_VISIBLE);
109 test_util::WaitUntilIdle(); 109 test_util::WaitUntilIdle();
110 DCHECK_EQ(activity1->GetCurrentState(), Activity::ACTIVITY_VISIBLE); 110 DCHECK_EQ(activity1->GetCurrentState(), Activity::ACTIVITY_VISIBLE);
111 111
112 DCHECK_EQ(activity1->GetActivityViewModel()->GetOverviewModeImage() 112 DCHECK_EQ(activity1->GetActivityViewModel()->GetOverviewModeImage()
113 .size().ToString(), 113 .size().ToString(),
114 gfx::Size().ToString()); 114 gfx::Size().ToString());
115 } 115 }
116 116
117 } // namespace athena 117 } // namespace athena
OLDNEW
« no previous file with comments | « no previous file | athena/test/chrome/athena_app_browsertest.h » ('j') | athena/test/chrome/athena_app_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698