Move ShellAccessTokenStore away from //content/shell/geolocation/.

It's odd to have a directory specifically for this, since the
other directories in //content/shell/ refer to the process
they're in.

BUG=

Review URL: https://codereview.chromium.org/653573003

Cr-Commit-Position: refs/heads/master@{#300973}

content/content_shell.gypi

@@ -118,6 +118,10 @@
         'shell/browser/layout_test/layout_test_url_request_context_getter.h',
         'shell/browser/notify_done_forwarder.cc',
         'shell/browser/notify_done_forwarder.h',
+        'shell/browser/shell.cc',
+        'shell/browser/shell.h',
+        'shell/browser/shell_access_token_store.cc',
+        'shell/browser/shell_access_token_store.h',
         'shell/browser/shell_android.cc',
         'shell/browser/shell_application_mac.h',
         'shell/browser/shell_application_mac.mm',
@@ -129,7 +133,6 @@
         'shell/browser/shell_browser_main_parts.cc',
         'shell/browser/shell_browser_main_parts.h',
         'shell/browser/shell_browser_main_parts_mac.mm',
-        'shell/browser/shell.cc',
         'shell/browser/shell_content_browser_client.cc',
         'shell/browser/shell_content_browser_client.h',
         'shell/browser/shell_devtools_delegate.cc',
@@ -138,7 +141,6 @@
         'shell/browser/shell_devtools_frontend.h',
         'shell/browser/shell_download_manager_delegate.cc',
         'shell/browser/shell_download_manager_delegate.h',
-        'shell/browser/shell.h',
         'shell/browser/shell_javascript_dialog.h',
         'shell/browser/shell_javascript_dialog_mac.mm',
         'shell/browser/shell_javascript_dialog_manager.cc',
@@ -189,8 +191,6 @@
         'shell/common/v8_breakpad_support_win.h',
         'shell/common/webkit_test_helpers.cc',
         'shell/common/webkit_test_helpers.h',
-        'shell/geolocation/shell_access_token_store.cc',
-        'shell/geolocation/shell_access_token_store.h',
         'shell/renderer/ipc_echo.cc',
         'shell/renderer/ipc_echo.h',
         'shell/renderer/layout_test/gc_controller.cc',

content/shell/BUILD.gn

@@ -67,6 +67,10 @@ static_library("content_shell_lib") {
     "browser/layout_test/layout_test_url_request_context_getter.h",
     "browser/notify_done_forwarder.cc",
     "browser/notify_done_forwarder.h",
+    "browser/shell.cc",
+    "browser/shell.h",
+    "browser/shell_access_token_store.cc",
+    "browser/shell_access_token_store.h",
     "browser/shell_android.cc",
     "browser/shell_application_mac.h",
     "browser/shell_application_mac.mm",
@@ -77,7 +81,6 @@ static_library("content_shell_lib") {
     "browser/shell_browser_main_parts.cc",
     "browser/shell_browser_main_parts.h",
     "browser/shell_browser_main_parts_mac.mm",
-    "browser/shell.cc",
     "browser/shell_content_browser_client.cc",
     "browser/shell_content_browser_client.h",
     "browser/shell_devtools_delegate.cc",
@@ -86,7 +89,6 @@ static_library("content_shell_lib") {
     "browser/shell_devtools_frontend.h",
     "browser/shell_download_manager_delegate.cc",
     "browser/shell_download_manager_delegate.h",
-    "browser/shell.h",
     "browser/shell_javascript_dialog.h",
     "browser/shell_javascript_dialog_mac.mm",
     "browser/shell_javascript_dialog_manager.cc",
@@ -134,8 +136,6 @@ static_library("content_shell_lib") {
     "common/test_runner/test_preferences.h",
     "common/webkit_test_helpers.cc",
     "common/webkit_test_helpers.h",
-    "geolocation/shell_access_token_store.cc",
-    "geolocation/shell_access_token_store.h",
     "renderer/ipc_echo.cc",
     "renderer/ipc_echo.h",
     "renderer/layout_test/gc_controller.cc",

content/shell/geolocation/shell_access_token_store.cc → content/shell/browser/shell_access_token_store.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/shell/geolocation/shell_access_token_store.h"
+#include "content/shell/browser/shell_access_token_store.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"

content/shell/geolocation/shell_access_token_store.h → content/shell/browser/shell_access_token_store.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_SHELL_GEOLOCATION_SHELL_ACCESS_TOKEN_STORE_H_
-#define CONTENT_SHELL_GEOLOCATION_SHELL_ACCESS_TOKEN_STORE_H_
+#ifndef CONTENT_SHELL_BROWSER_SHELL_ACCESS_TOKEN_STORE_H_
+#define CONTENT_SHELL_BROWSER_SHELL_ACCESS_TOKEN_STORE_H_
 
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/access_token_store.h"
@@ -39,4 +39,4 @@ class ShellAccessTokenStore : public content::AccessTokenStore {
 
 }  // namespace content
 
-#endif  // CONTENT_SHELL_GEOLOCATION_SHELL_ACCESS_TOKEN_STORE_H_
+#endif  // CONTENT_SHELL_BROWSER_SHELL_ACCESS_TOKEN_STORE_H_

content/shell/browser/shell_content_browser_client.cc

@@ -20,6 +20,7 @@
 #include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
 #include "content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h"
 #include "content/shell/browser/shell.h"
+#include "content/shell/browser/shell_access_token_store.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/browser/shell_browser_main_parts.h"
 #include "content/shell/browser/shell_devtools_delegate.h"
@@ -31,7 +32,6 @@
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
-#include "content/shell/geolocation/shell_access_token_store.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"