Merge DevTools Refactor CL to Blink36

Source/bindings/dart/DartController.h

 // Copyright 2011, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 61 matching lines @@
     // Exposes NPObject instance to Dart environment.
     void bindToWindowObject(LocalFrame*, const String& key, NPObject*);
     NPObject* npObject(const String& key);
 
     void clearWindowShell();
     void clearScriptObjects();
 
     Dart_Handle callFunction(Dart_Handle function, int argc, Dart_Handle* argv);
 
     LocalFrame* frame() const { return m_frame; }
-    void collectScriptStates(V8ScriptState* v8ScriptState, Vector<DartScriptState*>& result);
+    void collectScriptStates(V8ScriptState*, Vector<DartScriptState*>& result);
     void collectScriptStatesForIsolate(Dart_Isolate, v8::Handle<v8::Context> v8Context, Vector<DartScriptState*>& result);
     DartScriptState* lookupScriptState(Dart_Isolate, v8::Handle<v8::Context> v8Context, intptr_t libraryId);
 
     static DartController* retrieve(LocalFrame*);
     static DartController* retrieve(ExecutionContext*);
 
     bool isActive() { return !m_isolates.isEmpty(); }
 
     void spawnDomUri(const String& uri);
 
 private:
     static void initVMIfNeeded();
 
     static Dart_Isolate createIsolate(const char* scriptURL, const char* entryPoint, Document*, bool isDOMEnabled, bool isDebuggerEnabled, char** errorMessage);
-    static void shutdownIsolate(Dart_Isolate);
+    void shutdownIsolate(Dart_Isolate);
 
     Dart_Isolate createDOMEnabledIsolate(const String& scriptURL, const String& entryPoint, Document*);
     void scheduleScriptExecution(const String&, Dart_Isolate, PassRefPtr<DartAsyncLoader>, PassRefPtr<DartScriptInfo>);
     void loadAndRunScript(const String&, Dart_Isolate, PassRefPtr<DartAsyncLoader>, PassRefPtr<DartScriptInfo>);
     static void shutdownIsolateCallback(void* data);
     static Dart_Isolate createServiceIsolateCallback(void* callbackData, char** error);
     static Dart_Isolate createPureIsolateCallback(const char* prefix, const char* main, void* callbackData, char** errorMsg);
 
     static void weakCallback(void* isolateCallbackData, Dart_WeakPersistentHandle, void* peer);
 
@@ skipping 16 matching lines @@
     NPObjectMap m_npObjectMap;
 
     friend class DartDomLoadCallback;
     friend class DartScriptRunner;
     friend class DartService;
 };
 
 }
 
 #endif // DartController_h