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

Side by Side Diff: chrome_frame/test/ie_configurator.cc

Issue 10391051: Fix flake in chrome_frame_net_tests due to improper use of IE configurator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« no previous file with comments | « no previous file | chrome_frame/test/net/fake_external_tab.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_frame/test/ie_configurator.h" 5 #include "chrome_frame/test/ie_configurator.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <objbase.h> 8 #include <objbase.h>
9 9
10 #include <ios> 10 #include <ios>
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 454
455 IEConfigurator::~IEConfigurator() { 455 IEConfigurator::~IEConfigurator() {
456 } 456 }
457 457
458 IEConfigurator* CreateConfigurator() { 458 IEConfigurator* CreateConfigurator() {
459 IEConfigurator* configurator = NULL; 459 IEConfigurator* configurator = NULL;
460 460
461 switch (GetInstalledIEVersion()) { 461 switch (GetInstalledIEVersion()) {
462 case IE_7: 462 case IE_7:
463 configurator = new IE7Configurator(); 463 configurator = new IE7Configurator();
464 break;
464 case IE_9: 465 case IE_9:
465 configurator = new IE9Configurator(); 466 configurator = new IE9Configurator();
466 break; 467 break;
467 default: 468 default:
468 break; 469 break;
469 } 470 }
470 471
471 return configurator; 472 return configurator;
472 } 473 }
473 474
474 void InstallIEConfigurator() { 475 void InstallIEConfigurator() {
475 IEConfigurator* configurator = CreateConfigurator(); 476 IEConfigurator* configurator = CreateConfigurator();
476 477
477 if (configurator != NULL) { 478 if (configurator != NULL) {
478 testing::UnitTest::GetInstance()->listeners().Append( 479 testing::UnitTest::GetInstance()->listeners().Append(
479 new ConfiguratorDriver(configurator)); 480 new ConfiguratorDriver(configurator));
480 } 481 }
481 } 482 }
482 483
483 } // namespace chrome_frame_test 484 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « no previous file | chrome_frame/test/net/fake_external_tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698