[devtools] use separate process correctly

rogerwang · richardcypher · commit 7aac46ecdbf9 · 2013-07-10T11:18:43.000+08:00
In Ubuntu 12 VM for some reason SiteInstanceImpl::GetProcess
is called multiple times later in LoadURL and we should unpin
renderer correctly

content::SiteInstanceImpl::GetProcess()
content::SiteInstanceImpl::HasWrongProcessForURL()
content::RenderViewHostManager::GetSiteInstanceForEntry()
content::RenderViewHostManager::UpdateRendererStateForNavigate()
content::RenderViewHostManager::Navigate()
content::NavigationControllerImpl::NavigateToPendingEntry()
content::NavigationControllerImpl::LoadEntry()
content::NavigationControllerImpl::LoadURLWithParams()
content::NavigationControllerImpl::LoadURL()

content::SiteInstanceImpl::GetProcess()
content::RenderViewHostImpl::RenderViewHostImpl()
content::RenderViewHostFactory::Create()
content::RenderViewHostManager::CreateRenderView()
content::RenderViewHostManager::UpdateRendererStateForNavigate()
content::RenderViewHostManager::Navigate()
content::NavigationControllerImpl::NavigateToPendingEntry()
content::NavigationControllerImpl::LoadEntry()
content::NavigationControllerImpl::LoadURLWithParams()
content::NavigationControllerImpl::LoadURL()

fix bugs of useragentapp and datapath
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -359,14 +359,16 @@ void Shell::ShowDevTools(const char* jail_id, bool headless) {
   WebContents::CreateParams create_params(web_contents()->GetBrowserContext(), NULL);
   WebContents* web_contents = WebContents::Create(create_params);
   Shell* shell = new Shell(web_contents, &manifest);
-  browser_context->set_pinning_renderer(true);
 
   int rh_id = shell->web_contents_->GetRenderProcessHost()->GetID();
   ChildProcessSecurityPolicyImpl::GetInstance()->GrantScheme(rh_id, chrome::kFileScheme);
   shell->is_devtools_ = true;
   shell->force_close_ = true;
   shell->LoadURL(url);
 
+  // LoadURL() could allocate new SiteInstance so we have to pin the
+  // renderer after it
+  browser_context->set_pinning_renderer(true);
   // Save devtools window in current shell.
   devtools_window_ = shell->weak_ptr_factory_.GetWeakPtr();
 #endif
diff --git a/tests/automatic_tests/datapath/datacash-path/index.html b/tests/automatic_tests/datapath/datacash-path/index.html
@@ -15,6 +15,7 @@ <h1>Testing data path</h1>
       data: "ok"
     });
     document.write(info);
+    gui.Window.get().close();
 </script>
 </body>
 </html>
diff --git a/tests/automatic_tests/datapath/datacash/index.html b/tests/automatic_tests/datapath/datacash/index.html
@@ -15,6 +15,7 @@ <h1>Testing data path</h1>
       data: "ok"
     });
     document.write(info);
+    gui.Window.get().close();
 </script>
 </body>
 </html>
diff --git a/tests/automatic_tests/datapath/datapath-cash/index.html b/tests/automatic_tests/datapath/datapath-cash/index.html
@@ -15,6 +15,7 @@ <h1>Testing data path</h1>
       data: "ok"
     });
     document.write(info);
+    gui.Window.get().close();
 </script>
 </body>
 </html>
diff --git a/tests/automatic_tests/datapath/datapath/index.html b/tests/automatic_tests/datapath/datapath/index.html
@@ -15,6 +15,7 @@ <h1>Testing data path</h1>
       data: "ok"
     });
     document.write(info);
+    gui.Window.get().close();
 </script>
 </body>
 </html>
diff --git a/tests/automatic_tests/datapath/index.html b/tests/automatic_tests/datapath/index.html
diff --git a/tests/automatic_tests/datapath/mocha_test.js b/tests/automatic_tests/datapath/mocha_test.js
@@ -1,6 +1,7 @@
 var assert = require('assert');
 var fs = require('fs');
 var path = require('path');
+var gui = require('nw.gui');
 var app_test = require('./nw_test_app');
 describe('data-path', function() {
   it('setting datapath as ./data-cash/ should pass',
@@ -10,7 +11,6 @@ describe('data-path', function() {
         execPath: process.execPath,
         appPath: path.join(global.tests_dir, 'datapath/datacash'),
         end: function(data, app) {
-          app.kill();
             done();
         }
       });
@@ -23,7 +23,6 @@ describe('data-path', function() {
         execPath: process.execPath,
         appPath: path.join(global.tests_dir, 'datapath/datapath'),
         end: function(data, app) {
-          app.kill();
             done();
         }
       });
@@ -36,7 +35,6 @@ describe('data-path', function() {
         execPath: process.execPath,
         appPath: path.join(global.tests_dir, 'datapath/datapath-cash'),
         end: function(data, app) {
-          app.kill();
             done();
         }
       });
@@ -49,7 +47,6 @@ describe('data-path', function() {
         execPath: process.execPath,
         appPath: path.join(global.tests_dir, 'datapath/datacash-path'),
         end: function(data, app) {
-          app.kill();
             done();
         }
       });
diff --git a/tests/automatic_tests/datapath/package.json b/tests/automatic_tests/datapath/package.json
diff --git a/tests/automatic_tests/user-agent-app/popup.html b/tests/automatic_tests/user-agent-app/popup.html
