extensions: Change ScopedTempDir::path() to GetPath()

chrome/browser/extensions/extension_keybinding_apitest.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/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
@@ skipping 545 matching lines @@
   ASSERT_TRUE(catcher.GetNextResult());
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutAddedOnUpdate) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   base::FilePath pem_path = test_data_dir_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1_unassigned = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v1_unassigned"),
-      scoped_temp_dir.path().AppendASCII("v1_unassigned.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("v1_unassigned"),
+      scoped_temp_dir.GetPath().AppendASCII("v1_unassigned.crx"), pem_path,
       base::FilePath());
-  base::FilePath path_v2 = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v2"),
-      scoped_temp_dir.path().AppendASCII("v2.crx"),
-      pem_path,
-      base::FilePath());
+  base::FilePath path_v2 =
+      PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+                                   .AppendASCII("update")
+                                   .AppendASCII("v2"),
+                               scoped_temp_dir.GetPath().AppendASCII("v2.crx"),
+                               pem_path, base::FilePath());
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
   CommandService* command_service = CommandService::Get(browser()->profile());
 
   // Install v1 of the extension without keybinding assigned.
   ASSERT_TRUE(InstallExtension(path_v1_unassigned, 1));
   EXPECT_TRUE(registry->GetExtensionById(kId, ExtensionRegistry::ENABLED) !=
               NULL);
 
   // Verify it is set to nothing.
@@ skipping 13 matching lines @@
   EXPECT_FALSE(accelerator.IsCtrlDown());
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutChangedOnUpdate) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   base::FilePath pem_path = test_data_dir_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
-  base::FilePath path_v1 = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v1"),
-      scoped_temp_dir.path().AppendASCII("v1.crx"),
-      pem_path,
-      base::FilePath());
+  base::FilePath path_v1 =
+      PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+                                   .AppendASCII("update")
+                                   .AppendASCII("v1"),
+                               scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+                               pem_path, base::FilePath());
   base::FilePath path_v2_reassigned = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v2_reassigned"),
-      scoped_temp_dir.path().AppendASCII("v2_reassigned.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("v2_reassigned"),
+      scoped_temp_dir.GetPath().AppendASCII("v2_reassigned.crx"), pem_path,
       base::FilePath());
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
   CommandService* command_service = CommandService::Get(browser()->profile());
 
   // Install v1 of the extension.
   ASSERT_TRUE(InstallExtension(path_v1, 1));
   EXPECT_TRUE(registry->GetExtensionById(kId, ExtensionRegistry::ENABLED) !=
               NULL);
 
@@ skipping 17 matching lines @@
   EXPECT_FALSE(accelerator.IsCtrlDown());
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutRemovedOnUpdate) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   base::FilePath pem_path = test_data_dir_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
-  base::FilePath path_v1 = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v1"),
-      scoped_temp_dir.path().AppendASCII("v1.crx"),
-      pem_path,
-      base::FilePath());
+  base::FilePath path_v1 =
+      PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+                                   .AppendASCII("update")
+                                   .AppendASCII("v1"),
+                               scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+                               pem_path, base::FilePath());
   base::FilePath path_v2_unassigned = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v2_unassigned"),
-      scoped_temp_dir.path().AppendASCII("v2_unassigned.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("v2_unassigned"),
+      scoped_temp_dir.GetPath().AppendASCII("v2_unassigned.crx"), pem_path,
       base::FilePath());
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
   CommandService* command_service = CommandService::Get(browser()->profile());
 
   // Install v1 of the extension.
   ASSERT_TRUE(InstallExtension(path_v1, 1));
   EXPECT_TRUE(registry->GetExtensionById(kId, ExtensionRegistry::ENABLED) !=
               NULL);
 
@@ skipping 16 matching lines @@
   EXPECT_EQ(ui::VKEY_UNKNOWN, accelerator.key_code());
 }
 
 IN_PROC_BROWSER_TEST_F(CommandsApiTest,
                        ShortcutAddedOnUpdateAfterBeingAssignedByUser) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   base::FilePath pem_path = test_data_dir_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1_unassigned = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v1_unassigned"),
-      scoped_temp_dir.path().AppendASCII("v1_unassigned.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("v1_unassigned"),
+      scoped_temp_dir.GetPath().AppendASCII("v1_unassigned.crx"), pem_path,
       base::FilePath());
-  base::FilePath path_v2 = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v2"),
-      scoped_temp_dir.path().AppendASCII("v2.crx"),
-      pem_path,
-      base::FilePath());
+  base::FilePath path_v2 =
+      PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+                                   .AppendASCII("update")
+                                   .AppendASCII("v2"),
+                               scoped_temp_dir.GetPath().AppendASCII("v2.crx"),
+                               pem_path, base::FilePath());
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
   CommandService* command_service = CommandService::Get(browser()->profile());
 
   // Install v1 of the extension without keybinding assigned.
   ASSERT_TRUE(InstallExtension(path_v1_unassigned, 1));
   EXPECT_TRUE(registry->GetExtensionById(kId, ExtensionRegistry::ENABLED) !=
               NULL);
 
   // Verify it is set to nothing.
@@ skipping 18 matching lines @@
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 IN_PROC_BROWSER_TEST_F(CommandsApiTest,
                        ShortcutChangedOnUpdateAfterBeingReassignedByUser) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   base::FilePath pem_path = test_data_dir_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
-  base::FilePath path_v1 = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v1"),
-      scoped_temp_dir.path().AppendASCII("v1.crx"),
-      pem_path,
-      base::FilePath());
+  base::FilePath path_v1 =
+      PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+                                   .AppendASCII("update")
+                                   .AppendASCII("v1"),
+                               scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+                               pem_path, base::FilePath());
   base::FilePath path_v2_reassigned = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v2_reassigned"),
-      scoped_temp_dir.path().AppendASCII("v2_reassigned.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("v2_reassigned"),
+      scoped_temp_dir.GetPath().AppendASCII("v2_reassigned.crx"), pem_path,
       base::FilePath());
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
   CommandService* command_service = CommandService::Get(browser()->profile());
 
   // Install v1 of the extension.
   ASSERT_TRUE(InstallExtension(path_v1, 1));
   EXPECT_TRUE(registry->GetExtensionById(kId, ExtensionRegistry::ENABLED) !=
               NULL);
 
@@ skipping 24 matching lines @@
 }
 
 // Test that Media keys do not overwrite previous settings.
 IN_PROC_BROWSER_TEST_F(CommandsApiTest,
     MediaKeyShortcutChangedOnUpdateAfterBeingReassignedByUser) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   base::FilePath pem_path = test_data_dir_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1 = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("mk_v1"),
-      scoped_temp_dir.path().AppendASCII("mk_v1.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("mk_v1"),
+      scoped_temp_dir.GetPath().AppendASCII("mk_v1.crx"), pem_path,
       base::FilePath());
   base::FilePath path_v2_reassigned = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("mk_v2"),
-      scoped_temp_dir.path().AppendASCII("mk_v2.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("mk_v2"),
+      scoped_temp_dir.GetPath().AppendASCII("mk_v2.crx"), pem_path,
       base::FilePath());
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
   CommandService* command_service = CommandService::Get(browser()->profile());
 
   // Install v1 of the extension.
   ASSERT_TRUE(InstallExtension(path_v1, 1));
   EXPECT_TRUE(registry->GetExtensionById(kId, ExtensionRegistry::ENABLED) !=
               NULL);
 
@@ skipping 22 matching lines @@
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 IN_PROC_BROWSER_TEST_F(CommandsApiTest,
                        ShortcutRemovedOnUpdateAfterBeingReassignedByUser) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   base::FilePath pem_path = test_data_dir_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
-  base::FilePath path_v1 = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v1"),
-      scoped_temp_dir.path().AppendASCII("v1.crx"),
-      pem_path,
-      base::FilePath());
+  base::FilePath path_v1 =
+      PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
+                                   .AppendASCII("update")
+                                   .AppendASCII("v1"),
+                               scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
+                               pem_path, base::FilePath());
   base::FilePath path_v2_unassigned = PackExtensionWithOptions(
-      test_data_dir_.AppendASCII("keybinding").AppendASCII("update")
-                    .AppendASCII("v2_unassigned"),
-      scoped_temp_dir.path().AppendASCII("v2_unassigned.crx"),
-      pem_path,
+      test_data_dir_.AppendASCII("keybinding")
+          .AppendASCII("update")
+          .AppendASCII("v2_unassigned"),
+      scoped_temp_dir.GetPath().AppendASCII("v2_unassigned.crx"), pem_path,
       base::FilePath());
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
   CommandService* command_service = CommandService::Get(browser()->profile());
 
   // Install v1 of the extension.
   ASSERT_TRUE(InstallExtension(path_v1, 1));
   EXPECT_TRUE(registry->GetExtensionById(kId, ExtensionRegistry::ENABLED) !=
               NULL);
 
@@ skipping 82 matching lines @@
 
   extensions::ExtensionSystem::Get(browser()->profile())
       ->extension_service()
       ->component_loader()
       ->Remove("pkplfbidichfdicaijlchgnapepdginl");
 
   ASSERT_TRUE(RunComponentExtensionTest("keybinding/component")) << message_;
 }
 
 }  // namespace extensions