diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 20:49:23 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 20:49:23 +0000 |
| commit | e628fde3462899ba06af2fbc5285563c456ed5c4 (patch) | |
| tree | e3ed3eb98c0044b055606bdf8628191b9b99c17c /chrome_frame | |
| parent | 23d6315575647756c4be985b895ec2c447e2f088 (diff) | |
| download | chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.zip chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.tar.gz chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.tar.bz2 | |
Emergency revert; rietveld broke; tree broke
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index ec79019..8544a17 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -318,7 +318,7 @@ BOOL LowIntegrityToken::Impersonate() { return ok; } - // TODO(stoyan): sandbox/win/src/restricted_token_utils.cc has + // TODO(stoyan): sandbox/src/restricted_token_utils.cc has // SetTokenIntegrityLevel function already. base::win::ScopedHandle impersonation_token(impersonation_token_handle); PSID integrity_sid = NULL; diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index d333c13..151f267 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -63,7 +63,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_paths.h" #include "net/base/net_util.h" -#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/src/sandbox_types.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" |