diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
| commit | fd85ad650d68309b965dbc9f3d6823cf2754349c (patch) | |
| tree | 28b98629e02b2e05ec74272146f249ca62a164da /chrome_frame/test/net | |
| parent | ce072a7181ea5d58133e33654133236f5d9f5551 (diff) | |
| download | chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.zip chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.gz chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.bz2 | |
Move app/win_util to app/win and fix the namespace usage.
Split out the two classes: ScopedComInitializer and ScopedCOMem (which I renamed) to separate files.
I removed the win_util_path file which had one function in it and moved the function to win_util.
Somehow, this was getting picked up by the nacl64 build and the call in sandbox_policy was then not being
defined. I just implemented the function in-plcae since it's just a simple wrapper around a Windows API call.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6013009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 0d6c15b..0abae79 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -10,7 +10,7 @@ #include "app/app_paths.h" #include "app/resource_bundle.h" -#include "app/win_util.h" +#include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/debug_util.h" #include "base/file_util.h" @@ -269,7 +269,7 @@ void CFUrlRequestUnittestRunner::StartChromeFrameInHostBrowser() { if (!ShouldLaunchBrowser()) return; - win_util::ScopedCOMInitializer com; + app::win::ScopedCOMInitializer com; chrome_frame_test::CloseAllIEWindows(); test_http_server_.reset(new test_server::SimpleWebServer(kTestServerPort)); @@ -291,7 +291,7 @@ void CFUrlRequestUnittestRunner::StartChromeFrameInHostBrowser() { void CFUrlRequestUnittestRunner::ShutDownHostBrowser() { if (ShouldLaunchBrowser()) { - win_util::ScopedCOMInitializer com; + app::win::ScopedCOMInitializer com; chrome_frame_test::CloseAllIEWindows(); } } |