Move test runner component into its own namespace
[email protected]
BUG=478250
Review URL: https://codereview.chromium.org/1163593006
Cr-Commit-Position: refs/heads/master@{#332598}
diff --git a/components/test_runner/accessibility_controller.cc b/components/test_runner/accessibility_controller.cc
index 8919e40..4bd84b6 100644
--- a/components/test_runner/accessibility_controller.cc
+++ b/components/test_runner/accessibility_controller.cc
@@ -13,7 +13,7 @@
#include "third_party/WebKit/public/web/WebSettings.h"
#include "third_party/WebKit/public/web/WebView.h"
-namespace content {
+namespace test_runner {
class AccessibilityControllerBindings
: public gin::Wrappable<AccessibilityControllerBindings> {
@@ -275,4 +275,4 @@
return v8::Local<v8::Object>();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/accessibility_controller.h b/components/test_runner/accessibility_controller.h
index 4f66941..8617b107 100644
--- a/components/test_runner/accessibility_controller.h
+++ b/components/test_runner/accessibility_controller.h
@@ -18,7 +18,7 @@
class WebView;
}
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -70,6 +70,6 @@
DISALLOW_COPY_AND_ASSIGN(AccessibilityController);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_ACCESSIBILITY_CONTROLLER_H_
diff --git a/components/test_runner/app_banner_client.cc b/components/test_runner/app_banner_client.cc
index 169d8ec0..c76c251 100644
--- a/components/test_runner/app_banner_client.cc
+++ b/components/test_runner/app_banner_client.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptResult.h"
-namespace content {
+namespace test_runner {
AppBannerClient::AppBannerClient() {
}
@@ -40,4 +40,4 @@
callbacks_map_.Remove(request_id);
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/app_banner_client.h b/components/test_runner/app_banner_client.h
index 10560f3..f304baee3 100644
--- a/components/test_runner/app_banner_client.h
+++ b/components/test_runner/app_banner_client.h
@@ -8,7 +8,7 @@
#include "base/id_map.h"
#include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClient.h"
-namespace content {
+namespace test_runner {
// Test app banner client that holds on to callbacks and allows the test runner
// to resolve them.
@@ -30,6 +30,6 @@
DISALLOW_COPY_AND_ASSIGN(AppBannerClient);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_APP_BANNER_CLIENT_H_
diff --git a/components/test_runner/event_sender.cc b/components/test_runner/event_sender.cc
index db919f7..c78d0397 100644
--- a/components/test_runner/event_sender.cc
+++ b/components/test_runner/event_sender.cc
@@ -45,7 +45,7 @@
using blink::WebVector;
using blink::WebView;
-namespace content {
+namespace test_runner {
namespace {
@@ -2480,4 +2480,4 @@
return view_->handleInputEvent(event);
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/event_sender.h b/components/test_runner/event_sender.h
index ba00045..d58820b 100644
--- a/components/test_runner/event_sender.h
+++ b/components/test_runner/event_sender.h
@@ -30,7 +30,7 @@
class Arguments;
}
-namespace content {
+namespace test_runner {
class TestInterfaces;
class WebTestDelegate;
@@ -284,6 +284,6 @@
DISALLOW_COPY_AND_ASSIGN(EventSender);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
diff --git a/components/test_runner/gamepad_controller.cc b/components/test_runner/gamepad_controller.cc
index 615a051..58c58a2 100644
--- a/components/test_runner/gamepad_controller.cc
+++ b/components/test_runner/gamepad_controller.cc
@@ -18,7 +18,7 @@
using blink::WebGamepad;
using blink::WebGamepads;
-namespace content {
+namespace test_runner {
class GamepadControllerBindings
: public gin::Wrappable<GamepadControllerBindings> {
@@ -247,4 +247,4 @@
gamepads_.items[index].axes[axis] = data;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/gamepad_controller.h b/components/test_runner/gamepad_controller.h
index 9ecb28b..52ddb8b 100644
--- a/components/test_runner/gamepad_controller.h
+++ b/components/test_runner/gamepad_controller.h
@@ -15,7 +15,7 @@
class WebGamepadListener;
}
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -62,6 +62,6 @@
DISALLOW_COPY_AND_ASSIGN(GamepadController);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_GAMEPAD_CONTROLLER_H_
diff --git a/components/test_runner/mock_color_chooser.cc b/components/test_runner/mock_color_chooser.cc
index ab0ee6d8..55d586b3 100644
--- a/components/test_runner/mock_color_chooser.cc
+++ b/components/test_runner/mock_color_chooser.cc
@@ -7,7 +7,7 @@
#include "components/test_runner/web_test_delegate.h"
#include "components/test_runner/web_test_proxy.h"
-namespace content {
+namespace test_runner {
namespace {
class HostMethodTask : public WebMethodTask<MockColorChooser> {
@@ -49,4 +49,4 @@
client_->didEndChooser();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_color_chooser.h b/components/test_runner/mock_color_chooser.h
index daff0603..4656d9bb 100644
--- a/components/test_runner/mock_color_chooser.h
+++ b/components/test_runner/mock_color_chooser.h
@@ -10,7 +10,7 @@
#include "third_party/WebKit/public/web/WebColorChooser.h"
#include "third_party/WebKit/public/web/WebColorChooserClient.h"
-namespace content {
+namespace test_runner {
class WebTestDelegate;
class WebTestProxyBase;
@@ -38,6 +38,6 @@
DISALLOW_COPY_AND_ASSIGN(MockColorChooser);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_COLOR_CHOOSER_H_
diff --git a/components/test_runner/mock_constraints.cc b/components/test_runner/mock_constraints.cc
index 3f2e3090..9058619 100644
--- a/components/test_runner/mock_constraints.cc
+++ b/components/test_runner/mock_constraints.cc
@@ -12,7 +12,7 @@
using blink::WebString;
using blink::WebVector;
-namespace content {
+namespace test_runner {
namespace {
@@ -59,4 +59,4 @@
return true;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_constraints.h b/components/test_runner/mock_constraints.h
index 510dc4b..0096b4ba 100644
--- a/components/test_runner/mock_constraints.h
+++ b/components/test_runner/mock_constraints.h
@@ -10,7 +10,7 @@
class WebString;
}
-namespace content {
+namespace test_runner {
class MockConstraints {
public:
@@ -18,6 +18,6 @@
blink::WebString* failed_constraint = 0);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_CONSTRAINTS_H_
diff --git a/components/test_runner/mock_credential_manager_client.cc b/components/test_runner/mock_credential_manager_client.cc
index db782ba..6532d6a 100644
--- a/components/test_runner/mock_credential_manager_client.cc
+++ b/components/test_runner/mock_credential_manager_client.cc
@@ -6,7 +6,7 @@
#include "third_party/WebKit/public/platform/WebCredential.h"
-namespace content {
+namespace test_runner {
MockCredentialManagerClient::MockCredentialManagerClient() {
}
@@ -47,4 +47,4 @@
delete callbacks;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_credential_manager_client.h b/components/test_runner/mock_credential_manager_client.h
index ba374589..8f31547 100644
--- a/components/test_runner/mock_credential_manager_client.h
+++ b/components/test_runner/mock_credential_manager_client.h
@@ -15,7 +15,7 @@
class WebURL;
}
-namespace content {
+namespace test_runner {
class MockCredentialManagerClient : public blink::WebCredentialManagerClient {
public:
@@ -42,6 +42,6 @@
DISALLOW_COPY_AND_ASSIGN(MockCredentialManagerClient);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_CREDENTIAL_MANAGER_CLIENT_H_
diff --git a/components/test_runner/mock_grammar_check.cc b/components/test_runner/mock_grammar_check.cc
index 4153c2e..26f318f9 100644
--- a/components/test_runner/mock_grammar_check.cc
+++ b/components/test_runner/mock_grammar_check.cc
@@ -12,7 +12,7 @@
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/web/WebTextCheckingResult.h"
-namespace content {
+namespace test_runner {
bool MockGrammarCheck::CheckGrammarOfString(
const blink::WebString& text,
@@ -60,4 +60,4 @@
return false;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_grammar_check.h b/components/test_runner/mock_grammar_check.h
index c567670d..2642141d 100644
--- a/components/test_runner/mock_grammar_check.h
+++ b/components/test_runner/mock_grammar_check.h
@@ -12,7 +12,7 @@
struct WebTextCheckingResult;
}
-namespace content {
+namespace test_runner {
// A mock implementation of a grammar-checker used for WebKit tests. This class
// only implements the minimal functionarities required by WebKit tests, i.e.
@@ -25,6 +25,6 @@
std::vector<blink::WebTextCheckingResult>*);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_GRAMMAR_CHECK_H_
diff --git a/components/test_runner/mock_screen_orientation_client.cc b/components/test_runner/mock_screen_orientation_client.cc
index 0bd8f92..80a1dbf0 100644
--- a/components/test_runner/mock_screen_orientation_client.cc
+++ b/components/test_runner/mock_screen_orientation_client.cc
@@ -9,7 +9,7 @@
#include "base/message_loop/message_loop.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
-namespace content {
+namespace test_runner {
MockScreenOrientationClient::MockScreenOrientationClient()
: main_frame_(NULL),
@@ -158,4 +158,4 @@
}
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_screen_orientation_client.h b/components/test_runner/mock_screen_orientation_client.h
index 40e4352..0271f06 100644
--- a/components/test_runner/mock_screen_orientation_client.h
+++ b/components/test_runner/mock_screen_orientation_client.h
@@ -15,7 +15,7 @@
class WebLocalFrame;
}
-namespace content {
+namespace test_runner {
class MockScreenOrientationClient : public blink::WebScreenOrientationClient {
public:
@@ -52,6 +52,6 @@
DISALLOW_COPY_AND_ASSIGN(MockScreenOrientationClient);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_SCREEN_ORIENTATION_CLIENT_H_
diff --git a/components/test_runner/mock_spell_check.cc b/components/test_runner/mock_spell_check.cc
index 6dc875dbf..883ca5e4 100644
--- a/components/test_runner/mock_spell_check.cc
+++ b/components/test_runner/mock_spell_check.cc
@@ -8,7 +8,7 @@
#include "components/test_runner/test_common.h"
#include "third_party/WebKit/public/platform/WebCString.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -171,4 +171,4 @@
return false;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_spell_check.h b/components/test_runner/mock_spell_check.h
index b2c8799e..83255351 100644
--- a/components/test_runner/mock_spell_check.h
+++ b/components/test_runner/mock_spell_check.h
@@ -12,7 +12,7 @@
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/web/WebTextCheckingResult.h"
-namespace content {
+namespace test_runner {
// A mock implementation of a spell-checker used for WebKit tests.
// This class only implements the minimal functionarities required by WebKit
@@ -70,6 +70,6 @@
DISALLOW_COPY_AND_ASSIGN(MockSpellCheck);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_SPELL_CHECK_H_
diff --git a/components/test_runner/mock_web_audio_device.cc b/components/test_runner/mock_web_audio_device.cc
index 29caf95..6788d86 100644
--- a/components/test_runner/mock_web_audio_device.cc
+++ b/components/test_runner/mock_web_audio_device.cc
@@ -4,7 +4,7 @@
#include "components/test_runner/mock_web_audio_device.h"
-namespace content {
+namespace test_runner {
MockWebAudioDevice::MockWebAudioDevice(double sample_rate)
: sample_rate_(sample_rate) {}
@@ -19,4 +19,4 @@
return sample_rate_;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_web_audio_device.h b/components/test_runner/mock_web_audio_device.h
index befd5fb..14ad9b1 100644
--- a/components/test_runner/mock_web_audio_device.h
+++ b/components/test_runner/mock_web_audio_device.h
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "third_party/WebKit/public/platform/WebAudioDevice.h"
-namespace content {
+namespace test_runner {
class MockWebAudioDevice : public blink::WebAudioDevice {
public:
@@ -26,6 +26,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebAudioDevice);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEB_AUDIO_DEVICE_H_
diff --git a/components/test_runner/mock_web_media_stream_center.cc b/components/test_runner/mock_web_media_stream_center.cc
index 87b91bc4..e63a91fd 100644
--- a/components/test_runner/mock_web_media_stream_center.cc
+++ b/components/test_runner/mock_web_media_stream_center.cc
@@ -17,7 +17,7 @@
#include "third_party/WebKit/public/platform/WebSourceInfo.h"
#include "third_party/WebKit/public/platform/WebVector.h"
-namespace content {
+namespace test_runner {
namespace {
class NewTrackTask : public WebMethodTask<MockWebMediaStreamCenter> {
@@ -134,4 +134,4 @@
return NULL;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_web_media_stream_center.h b/components/test_runner/mock_web_media_stream_center.h
index f9d3bb8b..3d508ec 100644
--- a/components/test_runner/mock_web_media_stream_center.h
+++ b/components/test_runner/mock_web_media_stream_center.h
@@ -14,7 +14,7 @@
class WebMediaStreamCenterClient;
};
-namespace content {
+namespace test_runner {
class TestInterfaces;
@@ -50,6 +50,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebMediaStreamCenter);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEB_MEDIA_STREAM_CENTER_H_
diff --git a/components/test_runner/mock_web_midi_accessor.cc b/components/test_runner/mock_web_midi_accessor.cc
index d304f176..59fb45e6 100644
--- a/components/test_runner/mock_web_midi_accessor.cc
+++ b/components/test_runner/mock_web_midi_accessor.cc
@@ -10,7 +10,7 @@
#include "components/test_runner/web_test_runner.h"
#include "third_party/WebKit/public/platform/WebMIDIAccessorClient.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -62,4 +62,4 @@
this, client_, interfaces_->GetTestRunner()->midiAccessorResult()));
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_web_midi_accessor.h b/components/test_runner/mock_web_midi_accessor.h
index ec94dc9b..fbfb0c6 100644
--- a/components/test_runner/mock_web_midi_accessor.h
+++ b/components/test_runner/mock_web_midi_accessor.h
@@ -13,7 +13,7 @@
class WebMIDIAccessorClient;
}
-namespace content {
+namespace test_runner {
class TestInterfaces;
@@ -41,6 +41,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebMIDIAccessor);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEB_MIDI_ACCESSOR_H_
diff --git a/components/test_runner/mock_web_speech_recognizer.cc b/components/test_runner/mock_web_speech_recognizer.cc
index 4adf5b2..17b430d4 100644
--- a/components/test_runner/mock_web_speech_recognizer.cc
+++ b/components/test_runner/mock_web_speech_recognizer.cc
@@ -9,7 +9,7 @@
#include "third_party/WebKit/public/web/WebSpeechRecognitionResult.h"
#include "third_party/WebKit/public/web/WebSpeechRecognizerClient.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -250,4 +250,4 @@
object_->delegate_->PostTask(new StepTask(object_));
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_web_speech_recognizer.h b/components/test_runner/mock_web_speech_recognizer.h
index 11cbffa..8624660 100644
--- a/components/test_runner/mock_web_speech_recognizer.h
+++ b/components/test_runner/mock_web_speech_recognizer.h
@@ -19,7 +19,7 @@
class WebString;
}
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -93,6 +93,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebSpeechRecognizer);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEB_SPEECH_RECOGNIZER_H_
diff --git a/components/test_runner/mock_web_theme_engine.cc b/components/test_runner/mock_web_theme_engine.cc
index f8d7a46..47437833 100644
--- a/components/test_runner/mock_web_theme_engine.cc
+++ b/components/test_runner/mock_web_theme_engine.cc
@@ -17,7 +17,7 @@
using blink::WebRect;
using blink::WebThemeEngine;
-namespace content {
+namespace test_runner {
namespace {
@@ -589,6 +589,6 @@
}
}
-} // namespace content
+} // namespace test_runner
#endif // !defined(OS_MACOSX)
diff --git a/components/test_runner/mock_web_theme_engine.h b/components/test_runner/mock_web_theme_engine.h
index 22c39b53..362ed02 100644
--- a/components/test_runner/mock_web_theme_engine.h
+++ b/components/test_runner/mock_web_theme_engine.h
@@ -7,7 +7,7 @@
#include "third_party/WebKit/public/platform/WebThemeEngine.h"
-namespace content {
+namespace test_runner {
class MockWebThemeEngine : public blink::WebThemeEngine {
public:
@@ -24,6 +24,6 @@
#endif // !defined(OS_MACOSX)
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEB_THEME_ENGINE_H_
diff --git a/components/test_runner/mock_web_user_media_client.cc b/components/test_runner/mock_web_user_media_client.cc
index 28b4439f..f30fac9 100644
--- a/components/test_runner/mock_web_user_media_client.cc
+++ b/components/test_runner/mock_web_user_media_client.cc
@@ -33,7 +33,7 @@
using blink::WebUserMediaRequest;
using blink::WebVector;
-namespace content {
+namespace test_runner {
class UserMediaRequestTask : public WebMethodTask<MockWebUserMediaClient> {
public:
@@ -272,4 +272,4 @@
delegate_->PostTask(new SourcesRequestTask(this, request, sources));
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_web_user_media_client.h b/components/test_runner/mock_web_user_media_client.h
index 8deec13f..1140086 100644
--- a/components/test_runner/mock_web_user_media_client.h
+++ b/components/test_runner/mock_web_user_media_client.h
@@ -9,7 +9,7 @@
#include "components/test_runner/web_task.h"
#include "third_party/WebKit/public/web/WebUserMediaClient.h"
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -34,6 +34,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebUserMediaClient);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEB_USER_MEDIA_CLIENT_H_
diff --git a/components/test_runner/mock_webrtc_data_channel_handler.cc b/components/test_runner/mock_webrtc_data_channel_handler.cc
index b606075..c4419c2 100644
--- a/components/test_runner/mock_webrtc_data_channel_handler.cc
+++ b/components/test_runner/mock_webrtc_data_channel_handler.cc
@@ -10,7 +10,7 @@
using namespace blink;
-namespace content {
+namespace test_runner {
class DataChannelReadyStateTask
: public WebMethodTask<MockWebRTCDataChannelHandler> {
@@ -109,4 +109,4 @@
this, client_, WebRTCDataChannelHandlerClient::ReadyStateClosed));
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_webrtc_data_channel_handler.h b/components/test_runner/mock_webrtc_data_channel_handler.h
index 5227c60..46df5e67 100644
--- a/components/test_runner/mock_webrtc_data_channel_handler.h
+++ b/components/test_runner/mock_webrtc_data_channel_handler.h
@@ -12,7 +12,7 @@
#include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h"
#include "third_party/WebKit/public/platform/WebString.h"
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -57,6 +57,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebRTCDataChannelHandler);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEBRTC_DATA_CHANNEL_HANDLER_H_
diff --git a/components/test_runner/mock_webrtc_dtmf_sender_handler.cc b/components/test_runner/mock_webrtc_dtmf_sender_handler.cc
index 04bb9f39..69aba6f8 100644
--- a/components/test_runner/mock_webrtc_dtmf_sender_handler.cc
+++ b/components/test_runner/mock_webrtc_dtmf_sender_handler.cc
@@ -11,7 +11,7 @@
using namespace blink;
-namespace content {
+namespace test_runner {
class DTMFSenderToneTask : public WebMethodTask<MockWebRTCDTMFSenderHandler> {
public:
@@ -66,4 +66,4 @@
return true;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_webrtc_dtmf_sender_handler.h b/components/test_runner/mock_webrtc_dtmf_sender_handler.h
index f1d55a1..a42c197 100644
--- a/components/test_runner/mock_webrtc_dtmf_sender_handler.h
+++ b/components/test_runner/mock_webrtc_dtmf_sender_handler.h
@@ -11,7 +11,7 @@
#include "third_party/WebKit/public/platform/WebRTCDTMFSenderHandler.h"
#include "third_party/WebKit/public/platform/WebString.h"
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -45,6 +45,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebRTCDTMFSenderHandler);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEBRTC_DTMF_SENDER_HANDLER_H_
diff --git a/components/test_runner/mock_webrtc_peer_connection_handler.cc b/components/test_runner/mock_webrtc_peer_connection_handler.cc
index 3e357cd6..3aaa91d 100644
--- a/components/test_runner/mock_webrtc_peer_connection_handler.cc
+++ b/components/test_runner/mock_webrtc_peer_connection_handler.cc
@@ -22,7 +22,7 @@
using namespace blink;
-namespace content {
+namespace test_runner {
class RTCSessionDescriptionRequestSuccededTask
: public WebMethodTask<MockWebRTCPeerConnectionHandler> {
@@ -407,4 +407,4 @@
task_list_.RevokeAll();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/mock_webrtc_peer_connection_handler.h b/components/test_runner/mock_webrtc_peer_connection_handler.h
index c67e9e7..3470e1b 100644
--- a/components/test_runner/mock_webrtc_peer_connection_handler.h
+++ b/components/test_runner/mock_webrtc_peer_connection_handler.h
@@ -18,7 +18,7 @@
class WebRTCPeerConnectionHandlerClient;
};
-namespace content {
+namespace test_runner {
class TestInterfaces;
@@ -98,6 +98,6 @@
DISALLOW_COPY_AND_ASSIGN(MockWebRTCPeerConnectionHandler);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_MOCK_WEBRTC_PEER_CONNECTION_HANDLER_H_
diff --git a/components/test_runner/spell_check_client.cc b/components/test_runner/spell_check_client.cc
index ef56eeb..3798426 100644
--- a/components/test_runner/spell_check_client.cc
+++ b/components/test_runner/spell_check_client.cc
@@ -10,7 +10,7 @@
#include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
#include "third_party/WebKit/public/web/WebTextCheckingResult.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -149,4 +149,4 @@
return blink::WebString();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/spell_check_client.h b/components/test_runner/spell_check_client.h
index feeb3c0..d96afce 100644
--- a/components/test_runner/spell_check_client.h
+++ b/components/test_runner/spell_check_client.h
@@ -10,7 +10,7 @@
#include "components/test_runner/web_task.h"
#include "third_party/WebKit/public/web/WebSpellCheckClient.h"
-namespace content {
+namespace test_runner {
class WebTestDelegate;
class WebTestProxyBase;
@@ -60,6 +60,6 @@
DISALLOW_COPY_AND_ASSIGN(SpellCheckClient);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_SPELL_CHECK_CLIENT_H_
diff --git a/components/test_runner/test_common.cc b/components/test_runner/test_common.cc
index 2d54ed3..aac5337 100644
--- a/components/test_runner/test_common.cc
+++ b/components/test_runner/test_common.cc
@@ -4,7 +4,7 @@
#include "components/test_runner/test_common.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -34,4 +34,4 @@
return result;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/test_common.h b/components/test_runner/test_common.h
index ce6b88e..86d8432 100644
--- a/components/test_runner/test_common.h
+++ b/components/test_runner/test_common.h
@@ -7,7 +7,7 @@
#include <string>
-namespace content {
+namespace test_runner {
inline bool IsASCIIAlpha(char ch) {
return (ch | 0x20) >= 'a' && (ch | 0x20) <= 'z';
@@ -19,6 +19,6 @@
std::string NormalizeLayoutTestURL(const std::string& url);
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_TEST_COMMON_H_
diff --git a/components/test_runner/test_interfaces.cc b/components/test_runner/test_interfaces.cc
index 540c74a..614b679 100644
--- a/components/test_runner/test_interfaces.cc
+++ b/components/test_runner/test_interfaces.cc
@@ -23,7 +23,7 @@
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebView.h"
-namespace content {
+namespace test_runner {
TestInterfaces::TestInterfaces()
: accessibility_controller_(new AccessibilityController()),
@@ -185,4 +185,4 @@
return app_banner_client_;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/test_interfaces.h b/components/test_runner/test_interfaces.h
index 8c8cae5..3585b35f 100644
--- a/components/test_runner/test_interfaces.h
+++ b/components/test_runner/test_interfaces.h
@@ -20,7 +20,7 @@
class WebView;
}
-namespace content {
+namespace test_runner {
class AccessibilityController;
class AppBannerClient;
@@ -74,6 +74,6 @@
DISALLOW_COPY_AND_ASSIGN(TestInterfaces);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_TEST_INTERFACES_H_
diff --git a/components/test_runner/test_plugin.cc b/components/test_runner/test_plugin.cc
index ac42f2f..e3b9a5b 100644
--- a/components/test_runner/test_plugin.cc
+++ b/components/test_runner/test_plugin.cc
@@ -26,7 +26,7 @@
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -779,4 +779,4 @@
mime_type == CanCreateWithoutRendererMimeType();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/test_plugin.h b/components/test_runner/test_plugin.h
index 2d363806..efa0ca9 100644
--- a/components/test_runner/test_plugin.h
+++ b/components/test_runner/test_plugin.h
@@ -29,7 +29,7 @@
class SharedBitmap;
}
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -179,6 +179,6 @@
DISALLOW_COPY_AND_ASSIGN(TestPlugin);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_TEST_PLUGIN_H_
diff --git a/components/test_runner/test_preferences.cc b/components/test_runner/test_preferences.cc
index 11e2521..e4c0ca6a 100644
--- a/components/test_runner/test_preferences.cc
+++ b/components/test_runner/test_preferences.cc
@@ -9,7 +9,7 @@
using blink::WebSettings;
using blink::WebString;
-namespace content {
+namespace test_runner {
TestPreferences::TestPreferences() { Reset(); }
@@ -55,4 +55,4 @@
strict_powerful_feature_restrictions = false;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/test_preferences.h b/components/test_runner/test_preferences.h
index 0621b19..342dfd1 100644
--- a/components/test_runner/test_preferences.h
+++ b/components/test_runner/test_preferences.h
@@ -13,7 +13,7 @@
class WebView;
}
-namespace content {
+namespace test_runner {
struct TestPreferences {
int default_font_size;
diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc
index 5293d49..c48669a 100644
--- a/components/test_runner/test_runner.cc
+++ b/components/test_runner/test_runner.cc
@@ -59,7 +59,7 @@
using namespace blink;
-namespace content {
+namespace test_runner {
namespace {
@@ -3094,4 +3094,4 @@
web_view_->didLosePointerLock();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/test_runner.h b/components/test_runner/test_runner.h
index 52047be2..75fe1e1 100644
--- a/components/test_runner/test_runner.h
+++ b/components/test_runner/test_runner.h
@@ -32,7 +32,7 @@
class Arguments;
}
-namespace content {
+namespace test_runner {
class InvokeCallbackTask;
class TestInterfaces;
@@ -822,6 +822,6 @@
DISALLOW_COPY_AND_ASSIGN(TestRunner);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
diff --git a/components/test_runner/text_input_controller.cc b/components/test_runner/text_input_controller.cc
index d2fb0aa..465047e 100644
--- a/components/test_runner/text_input_controller.cc
+++ b/components/test_runner/text_input_controller.cc
@@ -16,7 +16,7 @@
#include "third_party/WebKit/public/web/WebView.h"
#include "v8/include/v8.h"
-namespace content {
+namespace test_runner {
class TextInputControllerBindings
: public gin::Wrappable<TextInputControllerBindings> {
@@ -261,4 +261,4 @@
view_->setComposition(web_text, underlines, 0, web_text.length());
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/text_input_controller.h b/components/test_runner/text_input_controller.h
index 8aa5c2a9..8edb56e 100644
--- a/components/test_runner/text_input_controller.h
+++ b/components/test_runner/text_input_controller.h
@@ -16,7 +16,7 @@
class WebView;
}
-namespace content {
+namespace test_runner {
// TextInputController is bound to window.textInputController in Javascript
// when content_shell is running. Layout tests use it to exercise various
@@ -51,6 +51,6 @@
DISALLOW_COPY_AND_ASSIGN(TextInputController);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_TEXT_INPUT_CONTROLLER_H_
diff --git a/components/test_runner/web_ax_object_proxy.cc b/components/test_runner/web_ax_object_proxy.cc
index 1dfa564..ae12816 100644
--- a/components/test_runner/web_ax_object_proxy.cc
+++ b/components/test_runner/web_ax_object_proxy.cc
@@ -12,7 +12,7 @@
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -1335,4 +1335,4 @@
return handle;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/web_ax_object_proxy.h b/components/test_runner/web_ax_object_proxy.h
index ec8eea59..b9abcaf 100644
--- a/components/test_runner/web_ax_object_proxy.h
+++ b/components/test_runner/web_ax_object_proxy.h
@@ -18,7 +18,7 @@
class WebFrame;
}
-namespace content {
+namespace test_runner {
class WebAXObjectProxy : public gin::Wrappable<WebAXObjectProxy> {
public:
@@ -189,6 +189,6 @@
ElementList elements_;
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_AX_OBJECT_PROXY_H_
diff --git a/components/test_runner/web_content_settings.cc b/components/test_runner/web_content_settings.cc
index 9a2f0c5..2bf83dae 100644
--- a/components/test_runner/web_content_settings.cc
+++ b/components/test_runner/web_content_settings.cc
@@ -9,7 +9,7 @@
#include "third_party/WebKit/public/platform/WebCString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
-namespace content {
+namespace test_runner {
WebContentSettings::WebContentSettings() : delegate_(0) {
Reset();
@@ -118,4 +118,4 @@
running_insecure_content_allowed_ = false;
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/web_content_settings.h b/components/test_runner/web_content_settings.h
index 360fe5a..89dd99df2 100644
--- a/components/test_runner/web_content_settings.h
+++ b/components/test_runner/web_content_settings.h
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "third_party/WebKit/public/web/WebContentSettingsClient.h"
-namespace content {
+namespace test_runner {
class WebTestDelegate;
@@ -62,6 +62,6 @@
DISALLOW_COPY_AND_ASSIGN(WebContentSettings);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_CONTENT_SETTINGS_H_
diff --git a/components/test_runner/web_frame_test_proxy.h b/components/test_runner/web_frame_test_proxy.h
index 8abd51e..d6bd3b5 100644
--- a/components/test_runner/web_frame_test_proxy.h
+++ b/components/test_runner/web_frame_test_proxy.h
@@ -13,7 +13,7 @@
#include "components/test_runner/web_test_proxy.h"
#include "third_party/WebKit/public/platform/WebString.h"
-namespace content {
+namespace test_runner {
// Templetized wrapper around RenderFrameImpl objects, which implement
// the WebFrameClient interface.
@@ -287,6 +287,6 @@
DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
diff --git a/components/test_runner/web_task.cc b/components/test_runner/web_task.cc
index 9377a2a8..df3cb699 100644
--- a/components/test_runner/web_task.cc
+++ b/components/test_runner/web_task.cc
@@ -8,7 +8,7 @@
#include "third_party/WebKit/public/web/WebKit.h"
-namespace content {
+namespace test_runner {
WebTask::WebTask(WebTaskList* list) : task_list_(list) {
task_list_->RegisterTask(this);
@@ -42,4 +42,4 @@
tasks_[0]->cancel();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/web_task.h b/components/test_runner/web_task.h
index 3efb8ddf..6261405 100644
--- a/components/test_runner/web_task.h
+++ b/components/test_runner/web_task.h
@@ -9,7 +9,7 @@
#include "base/macros.h"
-namespace content {
+namespace test_runner {
class WebTaskList;
@@ -72,6 +72,6 @@
T* object_;
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_TASK_H_
diff --git a/components/test_runner/web_test_delegate.h b/components/test_runner/web_test_delegate.h
index f3790f9..e921eae 100644
--- a/components/test_runner/web_test_delegate.h
+++ b/components/test_runner/web_test_delegate.h
@@ -42,7 +42,7 @@
class SharedBitmapManager;
}
-namespace content {
+namespace test_runner {
class DeviceLightData;
class GamepadController;
@@ -259,6 +259,6 @@
const blink::WebPluginParams& params) = 0;
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_TEST_DELEGATE_H_
diff --git a/components/test_runner/web_test_interfaces.cc b/components/test_runner/web_test_interfaces.cc
index 7a75c3d..e499d9a 100644
--- a/components/test_runner/web_test_interfaces.cc
+++ b/components/test_runner/web_test_interfaces.cc
@@ -14,7 +14,7 @@
using namespace blink;
-namespace content {
+namespace test_runner {
WebTestInterfaces::WebTestInterfaces() : interfaces_(new TestInterfaces()) {
}
@@ -86,4 +86,4 @@
return client.Pass();
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/web_test_interfaces.h b/components/test_runner/web_test_interfaces.h
index 763c6d7..6d46d74 100644
--- a/components/test_runner/web_test_interfaces.h
+++ b/components/test_runner/web_test_interfaces.h
@@ -22,7 +22,7 @@
class WebView;
}
-namespace content {
+namespace test_runner {
class TestInterfaces;
class WebTestDelegate;
@@ -65,6 +65,6 @@
DISALLOW_COPY_AND_ASSIGN(WebTestInterfaces);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_TEST_INTERFACES_H_
diff --git a/components/test_runner/web_test_proxy.cc b/components/test_runner/web_test_proxy.cc
index 3d0745ac..b021480 100644
--- a/components/test_runner/web_test_proxy.cc
+++ b/components/test_runner/web_test_proxy.cc
@@ -55,7 +55,7 @@
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/web/WebWidgetClient.h"
-namespace content {
+namespace test_runner {
namespace {
@@ -1393,4 +1393,4 @@
return blink::WebString::fromUTF8(accept_languages_);
}
-} // namespace content
+} // namespace test_runner
diff --git a/components/test_runner/web_test_proxy.h b/components/test_runner/web_test_proxy.h
index 0d5c9c26..47d350e 100644
--- a/components/test_runner/web_test_proxy.h
+++ b/components/test_runner/web_test_proxy.h
@@ -71,7 +71,7 @@
typedef unsigned WebColor;
}
-namespace content {
+namespace test_runner {
class MockCredentialManagerClient;
class MockScreenOrientationClient;
@@ -402,6 +402,6 @@
DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
diff --git a/components/test_runner/web_test_runner.h b/components/test_runner/web_test_runner.h
index 1408f98..c9820dc 100644
--- a/components/test_runner/web_test_runner.h
+++ b/components/test_runner/web_test_runner.h
@@ -11,7 +11,7 @@
class WebContentSettingsClient;
}
-namespace content {
+namespace test_runner {
class WebTestRunner {
public:
@@ -37,6 +37,6 @@
virtual bool ShouldGeneratePixelResults() = 0;
};
-} // namespace content
+} // namespace test_runner
#endif // COMPONENTS_TEST_RUNNER_WEB_TEST_RUNNER_H_
