Merge 140539

Source/WebCore/inspector/InspectorController.cpp

Index: Source/WebCore/inspector/InspectorController.cpp
===================================================================
--- Source/WebCore/inspector/InspectorController.cpp	(revision 142083)
+++ Source/WebCore/inspector/InspectorController.cpp	(working copy)
@@ -86,6 +86,7 @@
     , m_overlay(InspectorOverlay::create(page, inspectorClient))
     , m_page(page)
     , m_inspectorClient(inspectorClient)
+    , m_isUnderTest(false)
 {
     OwnPtr<InspectorAgent> inspectorAgentPtr(InspectorAgent::create(page, m_injectedScriptManager.get(), m_instrumentingAgents.get(), m_state.get()));
     m_inspectorAgent = inspectorAgentPtr.get();
@@ -298,8 +299,14 @@
     m_pageAgent->webViewResized(size);
 }
 
+bool InspectorController::isUnderTest()
+{
+    return m_isUnderTest;
+}
+
 void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
 {
+    m_isUnderTest = true;
     m_inspectorAgent->evaluateForTestInFrontend(callId, script);
 }