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

Side by Side Diff: chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc

Issue 136643006: Clean up some ifdefs around Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 10 months 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 5 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 void CancelCalled() { 136 void CancelCalled() {
137 if (runner_.get()) { 137 if (runner_.get()) {
138 content::BrowserThread::PostTask( 138 content::BrowserThread::PostTask(
139 content::BrowserThread::UI, FROM_HERE, runner_->QuitClosure()); 139 content::BrowserThread::UI, FROM_HERE, runner_->QuitClosure());
140 } 140 }
141 } 141 }
142 142
143 protected: 143 protected:
144 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 144 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
145 command_line->AppendSwitch(switches::kSingleProcess); 145 command_line->AppendSwitch(switches::kSingleProcess);
146 #if defined(OS_WIN) && defined(USE_AURA) 146 #if defined(OS_WIN)
147 // Don't want to try to create a GPU process. 147 // Don't want to try to create a GPU process.
148 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); 148 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
149 #endif 149 #endif
150 } 150 }
151 151
152 virtual void SetUpOnMainThread() OVERRIDE { 152 virtual void SetUpOnMainThread() OVERRIDE {
153 intercepting_filter_ = new InterceptingMessageFilter(); 153 intercepting_filter_ = new InterceptingMessageFilter();
154 content::RenderView* render_view = 154 content::RenderView* render_view =
155 content::RenderView::FromRoutingID(kRenderViewRoutingId); 155 content::RenderView::FromRoutingID(kRenderViewRoutingId);
156 156
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 RunClassificationDone(verdict); 625 RunClassificationDone(verdict);
626 ASSERT_TRUE(intercepting_filter_->verdict()); 626 ASSERT_TRUE(intercepting_filter_->verdict());
627 EXPECT_EQ(verdict.SerializeAsString(), 627 EXPECT_EQ(verdict.SerializeAsString(),
628 intercepting_filter_->verdict()->SerializeAsString()); 628 intercepting_filter_->verdict()->SerializeAsString());
629 629
630 // The delegate will cancel pending classification on destruction. 630 // The delegate will cancel pending classification on destruction.
631 EXPECT_CALL(*classifier_, CancelPendingClassification()); 631 EXPECT_CALL(*classifier_, CancelPendingClassification());
632 } 632 }
633 633
634 } // namespace safe_browsing 634 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698