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

Side by Side Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 6708013: Add separate ContentClient interfaces for gpu/plugin/renderer processes. Since we don't have a n... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « chrome/test/browser_with_test_window_test.cc ('k') | content/browser/content_browser_client.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 10
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 CFUrlRequestUnittestRunner::InitializeLogging(); 488 CFUrlRequestUnittestRunner::InitializeLogging();
489 LOG(INFO) << "Not running ChromeFrame net tests on IE9"; 489 LOG(INFO) << "Not running ChromeFrame net tests on IE9";
490 return 0; 490 return 0;
491 } 491 }
492 492
493 // Initialize the content client which that code uses to talk to Chrome. 493 // Initialize the content client which that code uses to talk to Chrome.
494 chrome::ChromeContentClient chrome_content_client; 494 chrome::ChromeContentClient chrome_content_client;
495 content::SetContentClient(&chrome_content_client); 495 content::SetContentClient(&chrome_content_client);
496 // Override the default ContentBrowserClient to let Chrome participate in 496 // Override the default ContentBrowserClient to let Chrome participate in
497 // content logic. Must be done before any tabs are created. 497 // content logic. Must be done before any tabs are created.
498 content::GetContentClient()->set_browser_client( 498 content::GetContentClient()->set_browser(
499 new chrome::ChromeContentBrowserClient); 499 new chrome::ChromeContentBrowserClient);
500 500
501 // TODO(tommi): Stuff be broke. Needs a fixin'. 501 // TODO(tommi): Stuff be broke. Needs a fixin'.
502 // This is awkward: the TestSuite derived CFUrlRequestUnittestRunner contains 502 // This is awkward: the TestSuite derived CFUrlRequestUnittestRunner contains
503 // the instance of the AtExitManager that RegisterPathProvider() and others 503 // the instance of the AtExitManager that RegisterPathProvider() and others
504 // below require. So we have to instantiate this first. 504 // below require. So we have to instantiate this first.
505 CFUrlRequestUnittestRunner test_suite(argc, argv); 505 CFUrlRequestUnittestRunner test_suite(argc, argv);
506 506
507 WindowWatchdog watchdog; 507 WindowWatchdog watchdog;
508 // See url_request_unittest.cc for these credentials. 508 // See url_request_unittest.cc for these credentials.
509 SupplyProxyCredentials credentials("user", "secret"); 509 SupplyProxyCredentials credentials("user", "secret");
510 watchdog.AddObserver(&credentials, "Windows Security", ""); 510 watchdog.AddObserver(&credentials, "Windows Security", "");
511 testing::InitGoogleTest(&argc, argv); 511 testing::InitGoogleTest(&argc, argv);
512 FilterDisabledTests(); 512 FilterDisabledTests();
513 test_suite.RunMainUIThread(); 513 test_suite.RunMainUIThread();
514 return 0; 514 return 0;
515 } 515 }
OLDNEW
« no previous file with comments | « chrome/test/browser_with_test_window_test.cc ('k') | content/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698