Context menu item to view original image when Data Saver is being used.

chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc

 // Copyright 2014 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 <string>
 
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/search_engines/template_url_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 using content::WebContents;
 
 namespace {
 
 class ContextMenuBrowserTest : public InProcessBrowserTest {
  public:
-  ContextMenuBrowserTest() { }
+  ContextMenuBrowserTest() {}
 
-  TestRenderViewContextMenu* CreateContextMenu(GURL unfiltered_url, GURL url) {
+  TestRenderViewContextMenu* CreateContextMenu(GURL unfiltered_url, GURL url,
+      blink::WebContextMenuData::MediaType media_type) {

[Alexei Svitkine (slow), 2015/02/20 18:37:27]

This doesn't follow style. Run "git cl format"?

[Not at Google. Contact bengr, 2015/02/21 00:11:17]

Done.

     content::ContextMenuParams params;
-    params.media_type = blink::WebContextMenuData::MediaTypeNone;
+    params.media_type = media_type;
     params.unfiltered_link_url = unfiltered_url;
     params.link_url = url;
+    params.src_url = url;
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     params.page_url = web_contents->GetController().GetActiveEntry()->GetURL();
 #if defined(OS_MACOSX)
     params.writing_direction_default = 0;
     params.writing_direction_left_to_right = 0;
     params.writing_direction_right_to_left = 0;
 #endif  // OS_MACOSX
     TestRenderViewContextMenu* menu = new TestRenderViewContextMenu(
         browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame(),
         params);
     menu->Init();
     return menu;
   }
+
+  TestRenderViewContextMenu* CreateContextMenu(GURL unfiltered_url, GURL url) {

[Alexei Svitkine (slow), 2015/02/20 18:37:27]

Pass params by const refs.

Same as above.

Also, give a different name as above, as overloads are discouraged.

[Not at Google. Contact bengr, 2015/02/21 00:11:16]

Done.

+    return CreateContextMenu(
+        unfiltered_url, url, blink::WebContextMenuData::MediaTypeNone);
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest,
                        OpenEntryPresentForNormalURLs) {
   scoped_ptr<TestRenderViewContextMenu> menu(
       CreateContextMenu(GURL("http://www.google.com/"),
                         GURL("http://www.google.com/")));
 
   ASSERT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB));
   ASSERT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW));
@@ skipping 216 matching lines @@
   TestRenderViewContextMenu menu(tab->GetMainFrame(), context_menu_params);
   menu.Init();
 
   // The item shouldn't be enabled in the menu.
   EXPECT_FALSE(menu.IsCommandIdEnabled(IDC_CONTENT_CONTEXT_VIEWPAGEINFO));
 
   // Ensure that viewing page info doesn't crash even if you can get to it.
   menu.ExecuteCommand(IDC_CONTENT_CONTEXT_VIEWPAGEINFO, 0);
 }
 
+IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, DataSaverOpenOrigImageInNewTab) {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  command_line->AppendSwitch(
+      data_reduction_proxy::switches::kEnableDataReductionProxy);
+
+  scoped_ptr<TestRenderViewContextMenu> menu(
+      CreateContextMenu(GURL(""),
+                        GURL("http://url.com/image.png"),
+                        blink::WebContextMenuData::MediaTypeImage));
+
+  ASSERT_FALSE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB));
+  ASSERT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB));
+}
+
+IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest,
+                       DataSaverHttpsOpenImageInNewTab) {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  command_line->AppendSwitch(
+      data_reduction_proxy::switches::kEnableDataReductionProxy);
+
+  scoped_ptr<TestRenderViewContextMenu> menu(
+      CreateContextMenu(GURL(""),
+                        GURL("https://url.com/image.png"),
+                        blink::WebContextMenuData::MediaTypeImage));
+
+  ASSERT_FALSE(
+      menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB));
+  ASSERT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB));
+}
+
+IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, OpenImageInNewTab) {
+  scoped_ptr<TestRenderViewContextMenu> menu(
+      CreateContextMenu(GURL(""),
+                        GURL("http://url.com/image.png"),
+                        blink::WebContextMenuData::MediaTypeImage));
+  ASSERT_FALSE(
+      menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB));
+  ASSERT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB));
+}
+
 class ThumbnailResponseWatcher : public content::NotificationObserver {
  public:
   enum QuitReason {
     STILL_RUNNING = 0,
     THUMBNAIL_RECEIVED,
     RENDER_PROCESS_GONE,
   };
 
   class MessageFilter : public content::BrowserMessageFilter {
    public:
@@ skipping 160 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   ThumbnailResponseWatcher watcher(tab->GetRenderProcessHost());
   AttemptImageSearch();
 
   // The browser should receive a response from the renderer, because the
   // renderer should not crash.
   EXPECT_EQ(ThumbnailResponseWatcher::THUMBNAIL_RECEIVED, watcher.Wait());
 }
 
 }  // namespace