Update the malware interstitial to have the new layout

chrome/browser/safe_browsing/safe_browsing_blocking_page.h

 // 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.
 //
 // Classes for managing the SafeBrowsing interstitial pages.
 //
 // When a user is about to visit a page the SafeBrowsing system has deemed to
 // be malicious, either as malware or a phishing page, we show an interstitial
 // page with some options (go back, continue) to give the user a chance to avoid
 // the harmful page.
@@ skipping 262 matching lines @@
                                 const base::string16& description1,
                                 const base::string16& description2,
                                 const base::string16& description3);
 
   // For the FieldTrial: this contains the name of the condition.
   std::string trialCondition_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPageV2);
 };
 
+class SafeBrowsingBlockingPageV3 : public SafeBrowsingBlockingPage {

[Bernhard Bauer, 2014/06/09 10:04:03]

If this class isn't meant to be directly instantiated, you could move it to an
anonymous namespace in the .cc file.

[felt, 2014/06/09 14:24:09]

I copied the pattern the pattern that's already in place in this file (if you
look above, V1 and V2 are handled in precisely the same way). Do you mind if I
leave as-is for consistency? Or should I refactor all three?

[Bernhard Bauer, 2014/06/09 14:45:41]

If you don't mind shaving some yak, it would be a nice cleanup. If you do mind,
it would be nice to leave at least a TODO here, so you (or some other helpful
contributor) can do it in a followup.

[felt, 2014/06/09 15:24:02]

I moved the V3 one into an anonymous namespace. I'll send another CL that does
the same for V1 and V2, to avoid confusion about what this CL touches.

[Bernhard Bauer, 2014/06/09 15:43:00]

Awesome, thanks!

+ public:
+  // Don't instantiate this class directly, use ShowBlockingPage instead.
+  SafeBrowsingBlockingPageV3(SafeBrowsingUIManager* ui_manager,
+                             content::WebContents* web_contents,
+                             const UnsafeResourceList& unsafe_resources);
+
+  // InterstitialPageDelegate method:
+  virtual std::string GetHTMLContents() OVERRIDE;
+
+ private:
+  // Fills the passed dictionary with the values to be passed to the template
+  // when creating the HTML.
+  void PopulateMalwareLoadTimeData(base::DictionaryValue* load_time_data);
+  void PopulatePhishingLoadTimeData(base::DictionaryValue* load_time_data);
+
+  DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPageV3);
+};
+
 // Factory for creating SafeBrowsingBlockingPage.  Useful for tests.
 class SafeBrowsingBlockingPageFactory {
  public:
   virtual ~SafeBrowsingBlockingPageFactory() { }
 
   virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
       SafeBrowsingUIManager* ui_manager,
       content::WebContents* web_contents,
       const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) = 0;
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_