Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

chrome/browser/safe_browsing/malware_details_unittest.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "base/bind.h"
 #include "base/pickle.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
@@ skipping 281 matching lines @@
   }
 
   // Adds a page to history.
   // The redirects is the redirect url chain leading to the url.
   void AddPageToHistory(const GURL& url,
                         history::RedirectList* redirects) {
     // The last item of the redirect chain has to be the final url when adding
     // to history backend.
     redirects->push_back(url);
     history_service()->AddPage(
-        url, static_cast<void*>(this), 0, GURL(), PageTransition::TYPED,
+        url, static_cast<void*>(this), 0, GURL(),
+        content::PAGE_TRANSITION_TYPED,
         *redirects, history::SOURCE_BROWSED, false);
   }
 
   BrowserThread ui_thread_;
   BrowserThread io_thread_;
   scoped_refptr<MockSafeBrowsingService> sb_service_;
 };
 
 // Tests creating a simple malware report.
 TEST_F(MalwareDetailsTest, MalwareSubResource) {
   // Start a load.
-  controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
-                       std::string());
+  controller().LoadURL(GURL(kLandingURL), GURL(),
+                       content::PAGE_TRANSITION_TYPED, std::string());
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
 
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_, contents(), resource, NULL);
 
   std::string serialized = WaitForSerializedReport(report);
 
   ClientMalwareReportRequest actual;
@@ skipping 10 matching lines @@
   pb_resource = expected.add_resources();
   pb_resource->set_id(1);
   pb_resource->set_url(kMalwareURL);
 
   VerifyResults(actual, expected);
 }
 
 // Tests creating a simple malware report where the subresource has a
 // different original_url.
 TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) {
-  controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
-                       std::string());
+  controller().LoadURL(GURL(kLandingURL), GURL(),
+                       content::PAGE_TRANSITION_TYPED, std::string());
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
   resource.original_url = GURL(kOriginalLandingURL);
 
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, NULL);
 
   std::string serialized = WaitForSerializedReport(report);
 
@@ skipping 18 matching lines @@
   pb_resource->set_url(kMalwareURL);
   // The Resource for kMmalwareUrl should have the Resource for
   // kOriginalLandingURL (with id 1) as parent.
   pb_resource->set_parent_id(1);
 
   VerifyResults(actual, expected);
 }
 
 // Tests creating a malware report with data from the renderer.
 TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
-  controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
-                       std::string());
+  controller().LoadURL(GURL(kLandingURL), GURL(),
+                       content::PAGE_TRANSITION_TYPED, std::string());
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
 
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, NULL);
 
   // Send a message from the DOM, with 2 nodes, a parent and a child.
   std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
   SafeBrowsingHostMsg_MalwareDOMDetails_Node child_node;
@@ skipping 35 matching lines @@
   pb_resource->set_id(3);
   pb_resource->set_url(kDOMParentURL);
   pb_resource->add_child_ids(2);
   expected.set_complete(false);  // Since the cache was missing.
 
   VerifyResults(actual, expected);
 }
 
 // Verify that https:// urls are dropped.
 TEST_F(MalwareDetailsTest, NotPublicUrl) {
-  controller().LoadURL(GURL(kHttpsURL), GURL(), PageTransition::TYPED,
+  controller().LoadURL(GURL(kHttpsURL), GURL(), content::PAGE_TRANSITION_TYPED,
                        std::string());
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, NULL);
 
   std::string serialized = WaitForSerializedReport(report);
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
 
   ClientMalwareReportRequest expected;
   expected.set_malware_url(kMalwareURL);  // No page_url
   expected.set_referrer_url("");
 
   ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
   pb_resource->set_url(kMalwareURL);  // Only one resource
 
   VerifyResults(actual, expected);
 }
 
 // Tests creating a malware report where there are redirect urls to an unsafe
 // resource url
 TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) {
-  controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
-                       std::string());
+  controller().LoadURL(GURL(kLandingURL), GURL(),
+                       content::PAGE_TRANSITION_TYPED, std::string());
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
   resource.original_url = GURL(kOriginalLandingURL);
 
   // add some redirect urls
   resource.redirect_urls.push_back(GURL(kFirstRedirectURL));
   resource.redirect_urls.push_back(GURL(kSecondRedirectURL));
   resource.redirect_urls.push_back(GURL(kMalwareURL));
 
@@ skipping 30 matching lines @@
   pb_resource = expected.add_resources();
   pb_resource->set_id(4);
   pb_resource->set_url(kSecondRedirectURL);
   pb_resource->set_parent_id(3);
 
   VerifyResults(actual, expected);
 }
 
 // Tests the interaction with the HTTP cache.
 TEST_F(MalwareDetailsTest, HTTPCache) {
-  controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
-                       std::string());
+  controller().LoadURL(GURL(kLandingURL), GURL(),
+                       content::PAGE_TRANSITION_TYPED, std::string());
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
 
   profile()->CreateRequestContext();
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, profile()->GetRequestContext());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ skipping 51 matching lines @@
   pb_response->set_bodydigest("581373551c43d4cf33bfb3b26838ff95");
   pb_response->set_remote_ip("1.2.3.4:80");
   expected.set_complete(true);
 
   VerifyResults(actual, expected);
   profile()->ResetRequestContext();
 }
 
 // Tests the interaction with the HTTP cache (where the cache is empty).
 TEST_F(MalwareDetailsTest, HTTPCacheNoEntries) {
-  controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
-                       std::string());
+  controller().LoadURL(GURL(kLandingURL), GURL(),
+                       content::PAGE_TRANSITION_TYPED, std::string());
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
 
   profile()->CreateRequestContext();
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource,
       profile()->GetRequestContext());
 
   // No call to FillCache
@@ skipping 32 matching lines @@
   // There are two redirect urls before reacing malware url:
   // kFirstRedirectURL -> kSecondRedirectURL -> kMalwareURL
   GURL baseurl(kMalwareURL);
   history::RedirectList redirects;
   redirects.push_back(GURL(kFirstRedirectURL));
   redirects.push_back(GURL(kSecondRedirectURL));
   AddPageToHistory(baseurl, &redirects);
   // Wait for history service operation finished.
   profile()->BlockUntilHistoryProcessesPendingRequests();
 
-  controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
-                       std::string());
+  controller().LoadURL(GURL(kLandingURL), GURL(),
+                       content::PAGE_TRANSITION_TYPED, std::string());
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       sb_service_.get(), contents(), resource, NULL);
 
   // The redirects collection starts after the IPC from the DOM is fired.
   std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
   report->OnReceivedMalwareDOMDetails(params);
 
@@ skipping 19 matching lines @@
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
   pb_resource->set_parent_id(3);
   pb_resource->set_url(kSecondRedirectURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(3);
   pb_resource->set_url(kFirstRedirectURL);
 
   VerifyResults(actual, expected);
 }