summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media
diff options
context:
space:
mode:
authorannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 18:46:38 +0000
committerannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 18:46:38 +0000
commit6e89290d7d706c0adedaf01713425094d4096526 (patch)
tree82612f318887b69f4eec4986b686f426021e72dd /webkit/glue/media
parent45568795e2a04e29cefdaad058f55563a98cd970 (diff)
downloadchromium_src-6e89290d7d706c0adedaf01713425094d4096526.zip
chromium_src-6e89290d7d706c0adedaf01713425094d4096526.tar.gz
chromium_src-6e89290d7d706c0adedaf01713425094d4096526.tar.bz2
moving mocks into webkit/mocks/
The number of mock_... files in webkit/glue is piling up and it makes more sense for them to live in a brand new mocks/ directory. BUG=None. TEST=Compiles. Review URL: http://codereview.chromium.org/5878006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/media')
-rw-r--r--webkit/glue/media/buffered_data_source_unittest.cc2
-rw-r--r--webkit/glue/media/buffered_resource_loader_unittest.cc4
-rw-r--r--webkit/glue/media/simple_data_source_unittest.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index 1e1bb1a..dcb11ec 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -11,7 +11,7 @@
#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
#include "webkit/glue/media/buffered_data_source.h"
-#include "webkit/glue/mock_webframe.h"
+#include "webkit/mocks/mock_webframe.h"
using ::testing::_;
using ::testing::Assign;
diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/glue/media/buffered_resource_loader_unittest.cc
index db9b49e..8e64c26 100644
--- a/webkit/glue/media/buffered_resource_loader_unittest.cc
+++ b/webkit/glue/media/buffered_resource_loader_unittest.cc
@@ -14,8 +14,8 @@
#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
#include "webkit/glue/media/buffered_resource_loader.h"
-#include "webkit/glue/mock_webframe.h"
-#include "webkit/glue/mock_weburlloader_impl.h"
+#include "webkit/mocks/mock_webframe.h"
+#include "webkit/mocks/mock_weburlloader.h"
using ::testing::_;
using ::testing::Assign;
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index c214949..55dc913 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/glue/media/simple_data_source_unittest.cc
@@ -13,8 +13,8 @@
#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
#include "webkit/glue/media/simple_data_source.h"
-#include "webkit/glue/mock_webframe.h"
-#include "webkit/glue/mock_weburlloader_impl.h"
+#include "webkit/mocks/mock_webframe.h"
+#include "webkit/mocks/mock_weburlloader.h"
using ::testing::_;
using ::testing::DoAll;