Index: android_webview/browser/aw_media_url_interceptor_unittest.cc |
diff --git a/android_webview/native/aw_media_url_interceptor_unittest.cc b/android_webview/browser/aw_media_url_interceptor_unittest.cc |
similarity index 68% |
rename from android_webview/native/aw_media_url_interceptor_unittest.cc |
rename to android_webview/browser/aw_media_url_interceptor_unittest.cc |
index b43dab987b44f2416d79439bfbc56a4f2d302884..aa8c22696d8d1e22bc576d34847234dcb331b437 100644 |
--- a/android_webview/native/aw_media_url_interceptor_unittest.cc |
+++ b/android_webview/browser/aw_media_url_interceptor_unittest.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "android_webview/native/aw_media_url_interceptor.h" |
+#include "android_webview/browser/aw_media_url_interceptor.h" |
#include <memory> |
#include <string> |
@@ -20,15 +20,17 @@ const int UNSET_VALUE = -1; |
class AwMediaUrlInterceptorTest : public Test { |
public: |
- AwMediaUrlInterceptorTest() |
- : fd_(UNSET_VALUE), offset_(UNSET_VALUE), size_(UNSET_VALUE), |
- url_interceptor_(new AwMediaUrlInterceptor()){ |
- } |
+ AwMediaUrlInterceptorTest() |
+ : fd_(UNSET_VALUE), |
+ offset_(UNSET_VALUE), |
+ size_(UNSET_VALUE), |
+ url_interceptor_(new AwMediaUrlInterceptor()) {} |
+ |
protected: |
- int fd_; |
- int64_t offset_; |
- int64_t size_; |
- std::unique_ptr<AwMediaUrlInterceptor> url_interceptor_; |
+ int fd_; |
+ int64_t offset_; |
+ int64_t size_; |
+ std::unique_ptr<AwMediaUrlInterceptor> url_interceptor_; |
}; |
} // namespace |
@@ -36,11 +38,10 @@ class AwMediaUrlInterceptorTest : public Test { |
TEST_F(AwMediaUrlInterceptorTest, TestInterceptValidAssetUrl) { |
// This asset file exists in the android_webview_unittests-debug.apk. |
// See gyp rule android_webview_unittests_apk. |
- const std::string valid_asset_url( |
- "file:///android_asset/asset_file.ogg"); |
+ const std::string valid_asset_url("file:///android_asset/asset_file.ogg"); |
- ASSERT_TRUE(url_interceptor_->Intercept( |
- valid_asset_url, &fd_, &offset_, &size_)); |
+ ASSERT_TRUE( |
+ url_interceptor_->Intercept(valid_asset_url, &fd_, &offset_, &size_)); |
EXPECT_NE(UNSET_VALUE, fd_); |
EXPECT_NE(UNSET_VALUE, offset_); |
EXPECT_NE(UNSET_VALUE, size_); |
@@ -52,8 +53,8 @@ TEST_F(AwMediaUrlInterceptorTest, TestInterceptInvalidAssetUrl) { |
const std::string invalid_asset_url( |
"file:///android_asset/file_does_not_exist.ogg"); |
- ASSERT_FALSE(url_interceptor_->Intercept( |
- invalid_asset_url, &fd_, &offset_, &size_)); |
+ ASSERT_FALSE( |
+ url_interceptor_->Intercept(invalid_asset_url, &fd_, &offset_, &size_)); |
EXPECT_EQ(UNSET_VALUE, fd_); |
EXPECT_EQ(UNSET_VALUE, offset_); |
EXPECT_EQ(UNSET_VALUE, size_); |
@@ -63,8 +64,8 @@ TEST_F(AwMediaUrlInterceptorTest, TestInterceptNonAssetUrl) { |
// This url does not refer to an asset in the apk. |
const std::string non_asset_url("file:///sdcard/file.txt"); |
- ASSERT_FALSE(url_interceptor_->Intercept( |
- non_asset_url, &fd_, &offset_, &size_)); |
+ ASSERT_FALSE( |
+ url_interceptor_->Intercept(non_asset_url, &fd_, &offset_, &size_)); |
EXPECT_EQ(UNSET_VALUE, fd_); |
EXPECT_EQ(UNSET_VALUE, offset_); |
EXPECT_EQ(UNSET_VALUE, size_); |