[WebView] Flatten lib/main to lib

android_webview/lib/aw_main_delegate.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 "android_webview/lib/main/aw_main_delegate.h"
+#include "android_webview/lib/aw_main_delegate.h"
 
 #include <memory>
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_media_url_interceptor.h"
 #include "android_webview/browser/aw_safe_browsing_config_helper.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/command_line_helper.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/common/aw_descriptors.h"
@@ skipping 27 matching lines @@
 #include "gin/v8_initializer.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/ipc/gl_in_process_context.h"
 #include "media/base/media_switches.h"
 #include "media/media_features.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace android_webview {
 
-AwMainDelegate::AwMainDelegate() {
-}
+AwMainDelegate::AwMainDelegate() {}
 
-AwMainDelegate::~AwMainDelegate() {
-}
+AwMainDelegate::~AwMainDelegate() {}
 
 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   content::SetContentClient(&content_client_);
 
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
 
   // WebView uses the Android system's scrollbars and overscroll glow.
   cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
 
   // Pull-to-refresh should never be a default WebView action.
   cl->AppendSwitch(switches::kDisablePullToRefreshEffect);
 
   // Not yet supported in single-process mode.
   cl->AppendSwitch(switches::kDisableSharedWorkers);
 
   // File system API not supported (requires some new API; internal bug 6930981)
   cl->AppendSwitch(switches::kDisableFileSystem);
 
   // Web Notification API and the Push API are not supported (crbug.com/434712)
   cl->AppendSwitch(switches::kDisableNotifications);
 
-  // WebRTC hardware decoding is not supported, internal bug 15075307
+// WebRTC hardware decoding is not supported, internal bug 15075307

[Torne, 2017/05/25 17:04:16]

It'd look nicer if you just moved the comment inside the #if and left it
indented. (which clang-format should be fine with)

[Shimi Zhang, 2017/05/25 17:40:41]

Done.

 #if BUILDFLAG(ENABLE_WEBRTC)
   cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
 #endif
 
   // This is needed for sharing textures across the different GL threads.
   cl->AppendSwitch(switches::kEnableThreadedTextureMailboxes);
 
   // WebView does not yet support screen orientation locking.
   cl->AppendSwitch(switches::kDisableScreenOrientationLock);
 
@@ skipping 142 matching lines @@
 
   return -1;
 }
 
 void AwMainDelegate::ProcessExiting(const std::string& process_type) {
   // TODO(torne): Clean up resources when we handle them.
 
   logging::CloseLogFile();
 }
 
-content::ContentBrowserClient*
-    AwMainDelegate::CreateContentBrowserClient() {
+content::ContentBrowserClient* AwMainDelegate::CreateContentBrowserClient() {
   content_browser_client_.reset(new AwContentBrowserClient());
   return content_browser_client_.get();
 }
 
 namespace {
 gpu::SyncPointManager* GetSyncPointManager() {
   DCHECK(DeferredGpuCommandService::GetInstance());
   return DeferredGpuCommandService::GetInstance()->sync_point_manager();
 }
 }  // namespace
 
 content::ContentGpuClient* AwMainDelegate::CreateContentGpuClient() {
   content_gpu_client_.reset(
       new AwContentGpuClient(base::Bind(&GetSyncPointManager)));
   return content_gpu_client_.get();
 }
 
-content::ContentRendererClient*
-    AwMainDelegate::CreateContentRendererClient() {
+content::ContentRendererClient* AwMainDelegate::CreateContentRendererClient() {
   content_renderer_client_.reset(new AwContentRendererClient());
   return content_renderer_client_.get();
 }
 
 }  // namespace android_webview