Move remaining files in content\browser\renderer_host to content namespace.

content/browser/renderer_host/render_view_host_manager_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/content_constants_internal.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
-using content::WebContentsImpl;
-
+namespace content {
 namespace {
 
 bool CompareTrees(base::DictionaryValue* first, base::DictionaryValue* second) {
   string16 name1;
   string16 name2;
-  if (!first->GetString(content::kFrameTreeNodeNameKey, &name1) ||
-      !second->GetString(content::kFrameTreeNodeNameKey, &name2))
+  if (!first->GetString(kFrameTreeNodeNameKey, &name1) ||
+      !second->GetString(kFrameTreeNodeNameKey, &name2))
     return false;
   if (name1 != name2)
     return false;
 
   int id1 = 0;
   int id2 = 0;
-  if (!first->GetInteger(content::kFrameTreeNodeIdKey, &id1) ||
-      !second->GetInteger(content::kFrameTreeNodeIdKey, &id2)) {
+  if (!first->GetInteger(kFrameTreeNodeIdKey, &id1) ||
+      !second->GetInteger(kFrameTreeNodeIdKey, &id2)) {
     return false;
   }
   if (id1 != id2)
     return false;
 
   ListValue* subtree1 = NULL;
   ListValue* subtree2 = NULL;
-  bool result1 = first->GetList(content::kFrameTreeNodeSubtreeKey, &subtree1);
-  bool result2 = second->GetList(content::kFrameTreeNodeSubtreeKey, &subtree2);
+  bool result1 = first->GetList(kFrameTreeNodeSubtreeKey, &subtree1);
+  bool result2 = second->GetList(kFrameTreeNodeSubtreeKey, &subtree2);
   if (!result1 && !result2)
     return true;
   if (!result1 || !result2)
     return false;
 
   if (subtree1->GetSize() != subtree2->GetSize())
     return false;
 
   base::DictionaryValue* child1 = NULL;
   base::DictionaryValue* child2 = NULL;
   for (size_t i = 0; i < subtree1->GetSize(); ++i) {
     if (!subtree1->GetDictionary(i, &child1) ||
         !subtree2->GetDictionary(i, &child2)) {
       return false;
     }
     if (!CompareTrees(child1, child2))
       return false;
   }
 
   return true;
 }
 
-base::DictionaryValue* GetTree(content::RenderViewHostImpl* rvh) {
+base::DictionaryValue* GetTree(RenderViewHostImpl* rvh) {
   std::string frame_tree = rvh->frame_tree();
   EXPECT_FALSE(frame_tree.empty());
   base::Value* v = base::JSONReader::Read(frame_tree);
   base::DictionaryValue* tree = NULL;
   EXPECT_TRUE(v->IsType(base::Value::TYPE_DICTIONARY));
   EXPECT_TRUE(v->GetAsDictionary(&tree));
   return tree;
 }
 
 } // namespace
 
-namespace content {
-
 class RenderViewHostManagerTest : public ContentBrowserTest {
  public:
   RenderViewHostManagerTest() {}
 
   static bool GetFilePathWithHostAndPortReplacement(
       const std::string& original_file_path,
       const net::HostPortPair& host_port_pair,
       std::string* replacement_path) {
     std::vector<net::TestServer::StringPair> replacement_text;
     replacement_text.push_back(
@@ skipping 954 matching lines @@
 
   // Observe the created render_view_host's to make sure they will not leak.
   RenderViewHostObserverArray rvh_observers;
 
   GURL navigated_url(test_server()->GetURL("files/title2.html"));
   GURL view_source_url(chrome::kViewSourceScheme + std::string(":") +
       navigated_url.spec());
 
   // Let's ensure that when we start with a blank window, navigating away to a
   // view-source URL, we create a new SiteInstance.
-  content::RenderViewHost* blank_rvh = shell()->web_contents()->
+  RenderViewHost* blank_rvh = shell()->web_contents()->
       GetRenderViewHost();
   SiteInstance* blank_site_instance = blank_rvh->GetSiteInstance();
   EXPECT_EQ(shell()->web_contents()->GetURL(), GURL::EmptyGURL());
   EXPECT_EQ(blank_site_instance->GetSiteURL(), GURL::EmptyGURL());
   rvh_observers.AddObserverToRVH(blank_rvh);
 
   // Now navigate to the view-source URL and ensure we got a different
   // SiteInstance and RenderViewHost.
   NavigateToURL(shell(), view_source_url);
   EXPECT_NE(blank_rvh, shell()->web_contents()->GetRenderViewHost());
@@ skipping 62 matching lines @@
   base::DictionaryValue* frames = NULL;
   base::ListValue* subtree = NULL;
 
   // First navigate to a page with no frames and ensure the frame tree has no
   // subtrees.
   NavigateToURL(shell(), test_server()->GetURL("files/simple_page.html"));
   WebContents* opener_contents = shell()->web_contents();
   RenderViewHostManager* opener_rvhm = static_cast<WebContentsImpl*>(
       opener_contents)->GetRenderManagerForTesting();
   frames = GetTree(opener_rvhm->current_host());
-  EXPECT_FALSE(frames->GetList(content::kFrameTreeNodeSubtreeKey, &subtree));
+  EXPECT_FALSE(frames->GetList(kFrameTreeNodeSubtreeKey, &subtree));
 
   NavigateToURL(shell(), frame_tree_url);
   frames = GetTree(opener_rvhm->current_host());
-  EXPECT_TRUE(frames->GetList(content::kFrameTreeNodeSubtreeKey, &subtree));
+  EXPECT_TRUE(frames->GetList(kFrameTreeNodeSubtreeKey, &subtree));
   EXPECT_TRUE(subtree->GetSize() == 3);
 
   scoped_refptr<SiteInstance> orig_site_instance(
       opener_contents->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   ShellAddedObserver shell_observer1;
   EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
       opener_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(openWindow('1-3.html'));",
@@ skipping 74 matching lines @@
       GetTree(opener_rvhm->current_host()), GetTree(rvhm2->current_host())));
 
   // Now let's ensure that using JS to add/remove frames results in proper
   // updates.
   EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
       opener_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(removeFrame());",
       &success));
   EXPECT_TRUE(success);
   frames = GetTree(opener_rvhm->current_host());
-  EXPECT_TRUE(frames->GetList(content::kFrameTreeNodeSubtreeKey, &subtree));
+  EXPECT_TRUE(frames->GetList(kFrameTreeNodeSubtreeKey, &subtree));
   EXPECT_EQ(subtree->GetSize(), 2U);
 
   // Create a load observer for the iframe that will be created by the
   // JavaScript code we will execute.
   WindowedNotificationObserver load_observer(
       NOTIFICATION_LOAD_STOP,
-      content::Source<NavigationController>(
+      Source<NavigationController>(
               &opener_contents->GetController()));
   EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
       opener_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(addFrame());",
       &success));
   EXPECT_TRUE(success);
   load_observer.Wait();
 
   frames = GetTree(opener_rvhm->current_host());
-  EXPECT_TRUE(frames->GetList(content::kFrameTreeNodeSubtreeKey, &subtree));
+  EXPECT_TRUE(frames->GetList(kFrameTreeNodeSubtreeKey, &subtree));
   EXPECT_EQ(subtree->GetSize(), 3U);
 
   EXPECT_TRUE(CompareTrees(
       GetTree(opener_rvhm->current_host()),
       GetTree(opener_rvhm->GetSwappedOutRenderViewHost(site_instance1))));
   EXPECT_TRUE(CompareTrees(
       GetTree(opener_rvhm->current_host()),
       GetTree(opener_rvhm->GetSwappedOutRenderViewHost(site_instance2))));
 }
 
@@ skipping 54 matching lines @@
   NavigateToURL(shell(), https_server.GetURL("files/title1.html"));
 
   // Make sure it ends up at the right page.
   WaitForLoadStop(shell()->web_contents());
   EXPECT_EQ(https_server.GetURL("files/title1.html"),
             shell()->web_contents()->GetURL());
   EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance());
 }
 
 }  // namespace content